You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by we...@apache.org on 2017/05/05 17:32:07 UTC
[20/51] [partial] hive git commit: HIVE-14671 : merge master into
hive-14535 (Wei Zheng)
http://git-wip-us.apache.org/repos/asf/hive/blob/187eb760/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h b/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
index 3f2fa56..d6a90cc 100644
--- a/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
+++ b/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
@@ -4968,22 +4968,25 @@ class GetOpenTxnsResponse {
GetOpenTxnsResponse(const GetOpenTxnsResponse&);
GetOpenTxnsResponse& operator=(const GetOpenTxnsResponse&);
- GetOpenTxnsResponse() : txn_high_water_mark(0), min_open_txn(0) {
+ GetOpenTxnsResponse() : txn_high_water_mark(0), min_open_txn(0), abortedBits() {
}
virtual ~GetOpenTxnsResponse() throw();
int64_t txn_high_water_mark;
- std::set<int64_t> open_txns;
+ std::vector<int64_t> open_txns;
int64_t min_open_txn;
+ std::string abortedBits;
_GetOpenTxnsResponse__isset __isset;
void __set_txn_high_water_mark(const int64_t val);
- void __set_open_txns(const std::set<int64_t> & val);
+ void __set_open_txns(const std::vector<int64_t> & val);
void __set_min_open_txn(const int64_t val);
+ void __set_abortedBits(const std::string& val);
+
bool operator == (const GetOpenTxnsResponse & rhs) const
{
if (!(txn_high_water_mark == rhs.txn_high_water_mark))
@@ -4994,6 +4997,8 @@ class GetOpenTxnsResponse {
return false;
else if (__isset.min_open_txn && !(min_open_txn == rhs.min_open_txn))
return false;
+ if (!(abortedBits == rhs.abortedBits))
+ return false;
return true;
}
bool operator != (const GetOpenTxnsResponse &rhs) const {
@@ -6588,7 +6593,8 @@ inline std::ostream& operator<<(std::ostream& out, const CurrentNotificationEven
}
typedef struct _InsertEventRequestData__isset {
- _InsertEventRequestData__isset() : filesAddedChecksum(false) {}
+ _InsertEventRequestData__isset() : replace(false), filesAddedChecksum(false) {}
+ bool replace :1;
bool filesAddedChecksum :1;
} _InsertEventRequestData__isset;
@@ -6597,21 +6603,28 @@ class InsertEventRequestData {
InsertEventRequestData(const InsertEventRequestData&);
InsertEventRequestData& operator=(const InsertEventRequestData&);
- InsertEventRequestData() {
+ InsertEventRequestData() : replace(0) {
}
virtual ~InsertEventRequestData() throw();
+ bool replace;
std::vector<std::string> filesAdded;
std::vector<std::string> filesAddedChecksum;
_InsertEventRequestData__isset __isset;
+ void __set_replace(const bool val);
+
void __set_filesAdded(const std::vector<std::string> & val);
void __set_filesAddedChecksum(const std::vector<std::string> & val);
bool operator == (const InsertEventRequestData & rhs) const
{
+ if (__isset.replace != rhs.__isset.replace)
+ return false;
+ else if (__isset.replace && !(replace == rhs.replace))
+ return false;
if (!(filesAdded == rhs.filesAdded))
return false;
if (__isset.filesAddedChecksum != rhs.__isset.filesAddedChecksum)
http://git-wip-us.apache.org/repos/asf/hive/blob/187eb760/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsResponse.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsResponse.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsResponse.java
index 8230d38..2852310 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsResponse.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsResponse.java
@@ -39,8 +39,9 @@ public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsR
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetOpenTxnsResponse");
private static final org.apache.thrift.protocol.TField TXN_HIGH_WATER_MARK_FIELD_DESC = new org.apache.thrift.protocol.TField("txn_high_water_mark", org.apache.thrift.protocol.TType.I64, (short)1);
- private static final org.apache.thrift.protocol.TField OPEN_TXNS_FIELD_DESC = new org.apache.thrift.protocol.TField("open_txns", org.apache.thrift.protocol.TType.SET, (short)2);
+ private static final org.apache.thrift.protocol.TField OPEN_TXNS_FIELD_DESC = new org.apache.thrift.protocol.TField("open_txns", org.apache.thrift.protocol.TType.LIST, (short)2);
private static final org.apache.thrift.protocol.TField MIN_OPEN_TXN_FIELD_DESC = new org.apache.thrift.protocol.TField("min_open_txn", org.apache.thrift.protocol.TType.I64, (short)3);
+ private static final org.apache.thrift.protocol.TField ABORTED_BITS_FIELD_DESC = new org.apache.thrift.protocol.TField("abortedBits", org.apache.thrift.protocol.TType.STRING, (short)4);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -49,14 +50,16 @@ public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsR
}
private long txn_high_water_mark; // required
- private Set<Long> open_txns; // required
+ private List<Long> open_txns; // required
private long min_open_txn; // optional
+ private ByteBuffer abortedBits; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
TXN_HIGH_WATER_MARK((short)1, "txn_high_water_mark"),
OPEN_TXNS((short)2, "open_txns"),
- MIN_OPEN_TXN((short)3, "min_open_txn");
+ MIN_OPEN_TXN((short)3, "min_open_txn"),
+ ABORTED_BITS((short)4, "abortedBits");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -77,6 +80,8 @@ public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsR
return OPEN_TXNS;
case 3: // MIN_OPEN_TXN
return MIN_OPEN_TXN;
+ case 4: // ABORTED_BITS
+ return ABORTED_BITS;
default:
return null;
}
@@ -127,10 +132,12 @@ public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsR
tmpMap.put(_Fields.TXN_HIGH_WATER_MARK, new org.apache.thrift.meta_data.FieldMetaData("txn_high_water_mark", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
tmpMap.put(_Fields.OPEN_TXNS, new org.apache.thrift.meta_data.FieldMetaData("open_txns", org.apache.thrift.TFieldRequirementType.REQUIRED,
- new org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))));
tmpMap.put(_Fields.MIN_OPEN_TXN, new org.apache.thrift.meta_data.FieldMetaData("min_open_txn", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+ tmpMap.put(_Fields.ABORTED_BITS, new org.apache.thrift.meta_data.FieldMetaData("abortedBits", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ 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(GetOpenTxnsResponse.class, metaDataMap);
}
@@ -140,12 +147,14 @@ public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsR
public GetOpenTxnsResponse(
long txn_high_water_mark,
- Set<Long> open_txns)
+ List<Long> open_txns,
+ ByteBuffer abortedBits)
{
this();
this.txn_high_water_mark = txn_high_water_mark;
setTxn_high_water_markIsSet(true);
this.open_txns = open_txns;
+ this.abortedBits = org.apache.thrift.TBaseHelper.copyBinary(abortedBits);
}
/**
@@ -155,10 +164,13 @@ public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsR
__isset_bitfield = other.__isset_bitfield;
this.txn_high_water_mark = other.txn_high_water_mark;
if (other.isSetOpen_txns()) {
- Set<Long> __this__open_txns = new HashSet<Long>(other.open_txns);
+ List<Long> __this__open_txns = new ArrayList<Long>(other.open_txns);
this.open_txns = __this__open_txns;
}
this.min_open_txn = other.min_open_txn;
+ if (other.isSetAbortedBits()) {
+ this.abortedBits = org.apache.thrift.TBaseHelper.copyBinary(other.abortedBits);
+ }
}
public GetOpenTxnsResponse deepCopy() {
@@ -172,6 +184,7 @@ public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsR
this.open_txns = null;
setMin_open_txnIsSet(false);
this.min_open_txn = 0;
+ this.abortedBits = null;
}
public long getTxn_high_water_mark() {
@@ -206,16 +219,16 @@ public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsR
public void addToOpen_txns(long elem) {
if (this.open_txns == null) {
- this.open_txns = new HashSet<Long>();
+ this.open_txns = new ArrayList<Long>();
}
this.open_txns.add(elem);
}
- public Set<Long> getOpen_txns() {
+ public List<Long> getOpen_txns() {
return this.open_txns;
}
- public void setOpen_txns(Set<Long> open_txns) {
+ public void setOpen_txns(List<Long> open_txns) {
this.open_txns = open_txns;
}
@@ -256,6 +269,38 @@ public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsR
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __MIN_OPEN_TXN_ISSET_ID, value);
}
+ public byte[] getAbortedBits() {
+ setAbortedBits(org.apache.thrift.TBaseHelper.rightSize(abortedBits));
+ return abortedBits == null ? null : abortedBits.array();
+ }
+
+ public ByteBuffer bufferForAbortedBits() {
+ return org.apache.thrift.TBaseHelper.copyBinary(abortedBits);
+ }
+
+ public void setAbortedBits(byte[] abortedBits) {
+ this.abortedBits = abortedBits == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(abortedBits, abortedBits.length));
+ }
+
+ public void setAbortedBits(ByteBuffer abortedBits) {
+ this.abortedBits = org.apache.thrift.TBaseHelper.copyBinary(abortedBits);
+ }
+
+ public void unsetAbortedBits() {
+ this.abortedBits = null;
+ }
+
+ /** Returns true if field abortedBits is set (has been assigned a value) and false otherwise */
+ public boolean isSetAbortedBits() {
+ return this.abortedBits != null;
+ }
+
+ public void setAbortedBitsIsSet(boolean value) {
+ if (!value) {
+ this.abortedBits = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case TXN_HIGH_WATER_MARK:
@@ -270,7 +315,7 @@ public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsR
if (value == null) {
unsetOpen_txns();
} else {
- setOpen_txns((Set<Long>)value);
+ setOpen_txns((List<Long>)value);
}
break;
@@ -282,6 +327,14 @@ public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsR
}
break;
+ case ABORTED_BITS:
+ if (value == null) {
+ unsetAbortedBits();
+ } else {
+ setAbortedBits((ByteBuffer)value);
+ }
+ break;
+
}
}
@@ -296,6 +349,9 @@ public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsR
case MIN_OPEN_TXN:
return getMin_open_txn();
+ case ABORTED_BITS:
+ return getAbortedBits();
+
}
throw new IllegalStateException();
}
@@ -313,6 +369,8 @@ public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsR
return isSetOpen_txns();
case MIN_OPEN_TXN:
return isSetMin_open_txn();
+ case ABORTED_BITS:
+ return isSetAbortedBits();
}
throw new IllegalStateException();
}
@@ -357,6 +415,15 @@ public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsR
return false;
}
+ boolean this_present_abortedBits = true && this.isSetAbortedBits();
+ boolean that_present_abortedBits = true && that.isSetAbortedBits();
+ if (this_present_abortedBits || that_present_abortedBits) {
+ if (!(this_present_abortedBits && that_present_abortedBits))
+ return false;
+ if (!this.abortedBits.equals(that.abortedBits))
+ return false;
+ }
+
return true;
}
@@ -379,6 +446,11 @@ public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsR
if (present_min_open_txn)
list.add(min_open_txn);
+ boolean present_abortedBits = true && (isSetAbortedBits());
+ list.add(present_abortedBits);
+ if (present_abortedBits)
+ list.add(abortedBits);
+
return list.hashCode();
}
@@ -420,6 +492,16 @@ public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsR
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetAbortedBits()).compareTo(other.isSetAbortedBits());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetAbortedBits()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.abortedBits, other.abortedBits);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -457,6 +539,14 @@ public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsR
sb.append(this.min_open_txn);
first = false;
}
+ if (!first) sb.append(", ");
+ sb.append("abortedBits:");
+ if (this.abortedBits == null) {
+ sb.append("null");
+ } else {
+ org.apache.thrift.TBaseHelper.toString(this.abortedBits, sb);
+ }
+ first = false;
sb.append(")");
return sb.toString();
}
@@ -471,6 +561,10 @@ public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsR
throw new org.apache.thrift.protocol.TProtocolException("Required field 'open_txns' is unset! Struct:" + toString());
}
+ if (!isSetAbortedBits()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'abortedBits' is unset! Struct:" + toString());
+ }
+
// check for sub-struct validity
}
@@ -519,17 +613,17 @@ public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsR
}
break;
case 2: // OPEN_TXNS
- if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TSet _set468 = iprot.readSetBegin();
- struct.open_txns = new HashSet<Long>(2*_set468.size);
+ org.apache.thrift.protocol.TList _list468 = iprot.readListBegin();
+ struct.open_txns = new ArrayList<Long>(_list468.size);
long _elem469;
- for (int _i470 = 0; _i470 < _set468.size; ++_i470)
+ for (int _i470 = 0; _i470 < _list468.size; ++_i470)
{
_elem469 = iprot.readI64();
struct.open_txns.add(_elem469);
}
- iprot.readSetEnd();
+ iprot.readListEnd();
}
struct.setOpen_txnsIsSet(true);
} else {
@@ -544,6 +638,14 @@ public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsR
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 4: // ABORTED_BITS
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.abortedBits = iprot.readBinary();
+ struct.setAbortedBitsIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -563,12 +665,12 @@ public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsR
if (struct.open_txns != null) {
oprot.writeFieldBegin(OPEN_TXNS_FIELD_DESC);
{
- oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, struct.open_txns.size()));
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, struct.open_txns.size()));
for (long _iter471 : struct.open_txns)
{
oprot.writeI64(_iter471);
}
- oprot.writeSetEnd();
+ oprot.writeListEnd();
}
oprot.writeFieldEnd();
}
@@ -577,6 +679,11 @@ public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsR
oprot.writeI64(struct.min_open_txn);
oprot.writeFieldEnd();
}
+ if (struct.abortedBits != null) {
+ oprot.writeFieldBegin(ABORTED_BITS_FIELD_DESC);
+ oprot.writeBinary(struct.abortedBits);
+ oprot.writeFieldEnd();
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -602,6 +709,7 @@ public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsR
oprot.writeI64(_iter472);
}
}
+ oprot.writeBinary(struct.abortedBits);
BitSet optionals = new BitSet();
if (struct.isSetMin_open_txn()) {
optionals.set(0);
@@ -618,16 +726,18 @@ public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsR
struct.txn_high_water_mark = iprot.readI64();
struct.setTxn_high_water_markIsSet(true);
{
- org.apache.thrift.protocol.TSet _set473 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, iprot.readI32());
- struct.open_txns = new HashSet<Long>(2*_set473.size);
+ org.apache.thrift.protocol.TList _list473 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
+ struct.open_txns = new ArrayList<Long>(_list473.size);
long _elem474;
- for (int _i475 = 0; _i475 < _set473.size; ++_i475)
+ for (int _i475 = 0; _i475 < _list473.size; ++_i475)
{
_elem474 = iprot.readI64();
struct.open_txns.add(_elem474);
}
}
struct.setOpen_txnsIsSet(true);
+ struct.abortedBits = iprot.readBinary();
+ struct.setAbortedBitsIsSet(true);
BitSet incoming = iprot.readBitSet(1);
if (incoming.get(0)) {
struct.min_open_txn = iprot.readI64();
http://git-wip-us.apache.org/repos/asf/hive/blob/187eb760/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InsertEventRequestData.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InsertEventRequestData.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InsertEventRequestData.java
index fd1dc06..354e634 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InsertEventRequestData.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InsertEventRequestData.java
@@ -38,8 +38,9 @@ import org.slf4j.LoggerFactory;
public class InsertEventRequestData implements org.apache.thrift.TBase<InsertEventRequestData, InsertEventRequestData._Fields>, java.io.Serializable, Cloneable, Comparable<InsertEventRequestData> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InsertEventRequestData");
- private static final org.apache.thrift.protocol.TField FILES_ADDED_FIELD_DESC = new org.apache.thrift.protocol.TField("filesAdded", org.apache.thrift.protocol.TType.LIST, (short)1);
- private static final org.apache.thrift.protocol.TField FILES_ADDED_CHECKSUM_FIELD_DESC = new org.apache.thrift.protocol.TField("filesAddedChecksum", org.apache.thrift.protocol.TType.LIST, (short)2);
+ private static final org.apache.thrift.protocol.TField REPLACE_FIELD_DESC = new org.apache.thrift.protocol.TField("replace", org.apache.thrift.protocol.TType.BOOL, (short)1);
+ private static final org.apache.thrift.protocol.TField FILES_ADDED_FIELD_DESC = new org.apache.thrift.protocol.TField("filesAdded", org.apache.thrift.protocol.TType.LIST, (short)2);
+ private static final org.apache.thrift.protocol.TField FILES_ADDED_CHECKSUM_FIELD_DESC = new org.apache.thrift.protocol.TField("filesAddedChecksum", org.apache.thrift.protocol.TType.LIST, (short)3);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -47,13 +48,15 @@ public class InsertEventRequestData implements org.apache.thrift.TBase<InsertEve
schemes.put(TupleScheme.class, new InsertEventRequestDataTupleSchemeFactory());
}
+ private boolean replace; // optional
private List<String> filesAdded; // required
private List<String> filesAddedChecksum; // 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 {
- FILES_ADDED((short)1, "filesAdded"),
- FILES_ADDED_CHECKSUM((short)2, "filesAddedChecksum");
+ REPLACE((short)1, "replace"),
+ FILES_ADDED((short)2, "filesAdded"),
+ FILES_ADDED_CHECKSUM((short)3, "filesAddedChecksum");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -68,9 +71,11 @@ public class InsertEventRequestData implements org.apache.thrift.TBase<InsertEve
*/
public static _Fields findByThriftId(int fieldId) {
switch(fieldId) {
- case 1: // FILES_ADDED
+ case 1: // REPLACE
+ return REPLACE;
+ case 2: // FILES_ADDED
return FILES_ADDED;
- case 2: // FILES_ADDED_CHECKSUM
+ case 3: // FILES_ADDED_CHECKSUM
return FILES_ADDED_CHECKSUM;
default:
return null;
@@ -112,10 +117,14 @@ public class InsertEventRequestData implements org.apache.thrift.TBase<InsertEve
}
// isset id assignments
- private static final _Fields optionals[] = {_Fields.FILES_ADDED_CHECKSUM};
+ private static final int __REPLACE_ISSET_ID = 0;
+ private byte __isset_bitfield = 0;
+ private static final _Fields optionals[] = {_Fields.REPLACE,_Fields.FILES_ADDED_CHECKSUM};
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);
+ tmpMap.put(_Fields.REPLACE, new org.apache.thrift.meta_data.FieldMetaData("replace", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
tmpMap.put(_Fields.FILES_ADDED, new org.apache.thrift.meta_data.FieldMetaData("filesAdded", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
@@ -140,6 +149,8 @@ public class InsertEventRequestData implements org.apache.thrift.TBase<InsertEve
* Performs a deep copy on <i>other</i>.
*/
public InsertEventRequestData(InsertEventRequestData other) {
+ __isset_bitfield = other.__isset_bitfield;
+ this.replace = other.replace;
if (other.isSetFilesAdded()) {
List<String> __this__filesAdded = new ArrayList<String>(other.filesAdded);
this.filesAdded = __this__filesAdded;
@@ -156,10 +167,34 @@ public class InsertEventRequestData implements org.apache.thrift.TBase<InsertEve
@Override
public void clear() {
+ setReplaceIsSet(false);
+ this.replace = false;
this.filesAdded = null;
this.filesAddedChecksum = null;
}
+ public boolean isReplace() {
+ return this.replace;
+ }
+
+ public void setReplace(boolean replace) {
+ this.replace = replace;
+ setReplaceIsSet(true);
+ }
+
+ public void unsetReplace() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __REPLACE_ISSET_ID);
+ }
+
+ /** Returns true if field replace is set (has been assigned a value) and false otherwise */
+ public boolean isSetReplace() {
+ return EncodingUtils.testBit(__isset_bitfield, __REPLACE_ISSET_ID);
+ }
+
+ public void setReplaceIsSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __REPLACE_ISSET_ID, value);
+ }
+
public int getFilesAddedSize() {
return (this.filesAdded == null) ? 0 : this.filesAdded.size();
}
@@ -238,6 +273,14 @@ public class InsertEventRequestData implements org.apache.thrift.TBase<InsertEve
public void setFieldValue(_Fields field, Object value) {
switch (field) {
+ case REPLACE:
+ if (value == null) {
+ unsetReplace();
+ } else {
+ setReplace((Boolean)value);
+ }
+ break;
+
case FILES_ADDED:
if (value == null) {
unsetFilesAdded();
@@ -259,6 +302,9 @@ public class InsertEventRequestData implements org.apache.thrift.TBase<InsertEve
public Object getFieldValue(_Fields field) {
switch (field) {
+ case REPLACE:
+ return isReplace();
+
case FILES_ADDED:
return getFilesAdded();
@@ -276,6 +322,8 @@ public class InsertEventRequestData implements org.apache.thrift.TBase<InsertEve
}
switch (field) {
+ case REPLACE:
+ return isSetReplace();
case FILES_ADDED:
return isSetFilesAdded();
case FILES_ADDED_CHECKSUM:
@@ -297,6 +345,15 @@ public class InsertEventRequestData implements org.apache.thrift.TBase<InsertEve
if (that == null)
return false;
+ boolean this_present_replace = true && this.isSetReplace();
+ boolean that_present_replace = true && that.isSetReplace();
+ if (this_present_replace || that_present_replace) {
+ if (!(this_present_replace && that_present_replace))
+ return false;
+ if (this.replace != that.replace)
+ return false;
+ }
+
boolean this_present_filesAdded = true && this.isSetFilesAdded();
boolean that_present_filesAdded = true && that.isSetFilesAdded();
if (this_present_filesAdded || that_present_filesAdded) {
@@ -322,6 +379,11 @@ public class InsertEventRequestData implements org.apache.thrift.TBase<InsertEve
public int hashCode() {
List<Object> list = new ArrayList<Object>();
+ boolean present_replace = true && (isSetReplace());
+ list.add(present_replace);
+ if (present_replace)
+ list.add(replace);
+
boolean present_filesAdded = true && (isSetFilesAdded());
list.add(present_filesAdded);
if (present_filesAdded)
@@ -343,6 +405,16 @@ public class InsertEventRequestData implements org.apache.thrift.TBase<InsertEve
int lastComparison = 0;
+ lastComparison = Boolean.valueOf(isSetReplace()).compareTo(other.isSetReplace());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetReplace()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.replace, other.replace);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
lastComparison = Boolean.valueOf(isSetFilesAdded()).compareTo(other.isSetFilesAdded());
if (lastComparison != 0) {
return lastComparison;
@@ -383,6 +455,12 @@ public class InsertEventRequestData implements org.apache.thrift.TBase<InsertEve
StringBuilder sb = new StringBuilder("InsertEventRequestData(");
boolean first = true;
+ if (isSetReplace()) {
+ sb.append("replace:");
+ sb.append(this.replace);
+ first = false;
+ }
+ if (!first) sb.append(", ");
sb.append("filesAdded:");
if (this.filesAdded == null) {
sb.append("null");
@@ -423,6 +501,8 @@ public class InsertEventRequestData implements org.apache.thrift.TBase<InsertEve
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
+ // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+ __isset_bitfield = 0;
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
@@ -447,7 +527,15 @@ public class InsertEventRequestData implements org.apache.thrift.TBase<InsertEve
break;
}
switch (schemeField.id) {
- case 1: // FILES_ADDED
+ case 1: // REPLACE
+ if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+ struct.replace = iprot.readBool();
+ struct.setReplaceIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // FILES_ADDED
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list558 = iprot.readListBegin();
@@ -465,7 +553,7 @@ public class InsertEventRequestData implements org.apache.thrift.TBase<InsertEve
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 2: // FILES_ADDED_CHECKSUM
+ case 3: // FILES_ADDED_CHECKSUM
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list561 = iprot.readListBegin();
@@ -496,6 +584,11 @@ public class InsertEventRequestData implements org.apache.thrift.TBase<InsertEve
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.isSetReplace()) {
+ oprot.writeFieldBegin(REPLACE_FIELD_DESC);
+ oprot.writeBool(struct.replace);
+ oprot.writeFieldEnd();
+ }
if (struct.filesAdded != null) {
oprot.writeFieldBegin(FILES_ADDED_FIELD_DESC);
{
@@ -547,10 +640,16 @@ public class InsertEventRequestData implements org.apache.thrift.TBase<InsertEve
}
}
BitSet optionals = new BitSet();
- if (struct.isSetFilesAddedChecksum()) {
+ if (struct.isSetReplace()) {
optionals.set(0);
}
- oprot.writeBitSet(optionals, 1);
+ if (struct.isSetFilesAddedChecksum()) {
+ optionals.set(1);
+ }
+ oprot.writeBitSet(optionals, 2);
+ if (struct.isSetReplace()) {
+ oprot.writeBool(struct.replace);
+ }
if (struct.isSetFilesAddedChecksum()) {
{
oprot.writeI32(struct.filesAddedChecksum.size());
@@ -576,8 +675,12 @@ public class InsertEventRequestData implements org.apache.thrift.TBase<InsertEve
}
}
struct.setFilesAddedIsSet(true);
- BitSet incoming = iprot.readBitSet(1);
+ BitSet incoming = iprot.readBitSet(2);
if (incoming.get(0)) {
+ struct.replace = iprot.readBool();
+ struct.setReplaceIsSet(true);
+ }
+ if (incoming.get(1)) {
{
org.apache.thrift.protocol.TList _list571 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.filesAddedChecksum = new ArrayList<String>(_list571.size);