http://git-wip-us.apache.org/repos/asf/hive/blob/92072ad2/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceUri.java ---------------------------------------------------------------------- diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceUri.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceUri.java index 3b3df25..e51171a 100644 --- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceUri.java +++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceUri.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-14") public class ResourceUri implements org.apache.thrift.TBase<ResourceUri, ResourceUri._Fields>, java.io.Serializable, Cloneable, Comparable<ResourceUri> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ResourceUri");
http://git-wip-us.apache.org/repos/asf/hive/blob/92072ad2/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Role.java ---------------------------------------------------------------------- diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Role.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Role.java index 5c882d2..df2e118 100644 --- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Role.java +++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Role.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-14") public class Role implements org.apache.thrift.TBase<Role, Role._Fields>, java.io.Serializable, Cloneable, Comparable<Role> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Role"); @@ -276,7 +276,7 @@ public class Role implements org.apache.thrift.TBase<Role, Role._Fields>, java.i return getRoleName(); case CREATE_TIME: - return Integer.valueOf(getCreateTime()); + return getCreateTime(); case OWNER_NAME: return getOwnerName(); http://git-wip-us.apache.org/repos/asf/hive/blob/92072ad2/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RolePrincipalGrant.java ---------------------------------------------------------------------- diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RolePrincipalGrant.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RolePrincipalGrant.java index c4beb08..15309f2 100644 --- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RolePrincipalGrant.java +++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RolePrincipalGrant.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-14") public class RolePrincipalGrant implements org.apache.thrift.TBase<RolePrincipalGrant, RolePrincipalGrant._Fields>, java.io.Serializable, Cloneable, Comparable<RolePrincipalGrant> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RolePrincipalGrant"); @@ -482,10 +482,10 @@ public class RolePrincipalGrant implements org.apache.thrift.TBase<RolePrincipal return getPrincipalType(); case GRANT_OPTION: - return Boolean.valueOf(isGrantOption()); + return isGrantOption(); case GRANT_TIME: - return Integer.valueOf(getGrantTime()); + return getGrantTime(); case GRANTOR_NAME: return getGrantorName(); http://git-wip-us.apache.org/repos/asf/hive/blob/92072ad2/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Schema.java ---------------------------------------------------------------------- diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Schema.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Schema.java index 8772180..c98b282 100644 --- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Schema.java +++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Schema.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-14") public class Schema implements org.apache.thrift.TBase<Schema, Schema._Fields>, java.io.Serializable, Cloneable, Comparable<Schema> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Schema"); http://git-wip-us.apache.org/repos/asf/hive/blob/92072ad2/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java ---------------------------------------------------------------------- diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java index b30e698..322e606 100644 --- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java +++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-14") public class SerDeInfo implements org.apache.thrift.TBase<SerDeInfo, SerDeInfo._Fields>, java.io.Serializable, Cloneable, Comparable<SerDeInfo> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SerDeInfo"); http://git-wip-us.apache.org/repos/asf/hive/blob/92072ad2/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetPartitionsStatsRequest.java ---------------------------------------------------------------------- diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetPartitionsStatsRequest.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetPartitionsStatsRequest.java index 7da298c..0032b83 100644 --- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetPartitionsStatsRequest.java +++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetPartitionsStatsRequest.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-14") public class SetPartitionsStatsRequest implements org.apache.thrift.TBase<SetPartitionsStatsRequest, SetPartitionsStatsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<SetPartitionsStatsRequest> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SetPartitionsStatsRequest"); http://git-wip-us.apache.org/repos/asf/hive/blob/92072ad2/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactRequest.java ---------------------------------------------------------------------- diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactRequest.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactRequest.java index 7756384..bff06f9 100644 --- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactRequest.java +++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactRequest.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-14") public class ShowCompactRequest implements org.apache.thrift.TBase<ShowCompactRequest, ShowCompactRequest._Fields>, java.io.Serializable, Cloneable, Comparable<ShowCompactRequest> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ShowCompactRequest"); http://git-wip-us.apache.org/repos/asf/hive/blob/92072ad2/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponse.java ---------------------------------------------------------------------- diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponse.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponse.java index dd1e857..6709a9e 100644 --- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponse.java +++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponse.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-14") public class ShowCompactResponse implements org.apache.thrift.TBase<ShowCompactResponse, ShowCompactResponse._Fields>, java.io.Serializable, Cloneable, Comparable<ShowCompactResponse> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ShowCompactResponse"); http://git-wip-us.apache.org/repos/asf/hive/blob/92072ad2/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponseElement.java ---------------------------------------------------------------------- diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponseElement.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponseElement.java index cd7e79e..1a1b453 100644 --- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponseElement.java +++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponseElement.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-14") public class ShowCompactResponseElement implements org.apache.thrift.TBase<ShowCompactResponseElement, ShowCompactResponseElement._Fields>, java.io.Serializable, Cloneable, Comparable<ShowCompactResponseElement> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ShowCompactResponseElement"); @@ -46,6 +46,10 @@ public class ShowCompactResponseElement implements org.apache.thrift.TBase<ShowC private static final org.apache.thrift.protocol.TField WORKERID_FIELD_DESC = new org.apache.thrift.protocol.TField("workerid", org.apache.thrift.protocol.TType.STRING, (short)6); private static final org.apache.thrift.protocol.TField START_FIELD_DESC = new org.apache.thrift.protocol.TField("start", org.apache.thrift.protocol.TType.I64, (short)7); private static final org.apache.thrift.protocol.TField RUN_AS_FIELD_DESC = new org.apache.thrift.protocol.TField("runAs", org.apache.thrift.protocol.TType.STRING, (short)8); + private static final org.apache.thrift.protocol.TField HIGHTEST_TXN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("hightestTxnId", org.apache.thrift.protocol.TType.I64, (short)9); + private static final org.apache.thrift.protocol.TField META_INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("metaInfo", org.apache.thrift.protocol.TType.STRING, (short)10); + private static final org.apache.thrift.protocol.TField END_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("endTime", org.apache.thrift.protocol.TType.I64, (short)11); + private static final org.apache.thrift.protocol.TField HADOOP_JOB_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("hadoopJobId", org.apache.thrift.protocol.TType.STRING, (short)12); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -61,6 +65,10 @@ public class ShowCompactResponseElement implements org.apache.thrift.TBase<ShowC private String workerid; // optional private long start; // optional private String runAs; // optional + private long hightestTxnId; // optional + private String metaInfo; // optional + private long endTime; // optional + private String hadoopJobId; // 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 { @@ -75,7 +83,11 @@ public class ShowCompactResponseElement implements org.apache.thrift.TBase<ShowC STATE((short)5, "state"), WORKERID((short)6, "workerid"), START((short)7, "start"), - RUN_AS((short)8, "runAs"); + RUN_AS((short)8, "runAs"), + HIGHTEST_TXN_ID((short)9, "hightestTxnId"), + META_INFO((short)10, "metaInfo"), + END_TIME((short)11, "endTime"), + HADOOP_JOB_ID((short)12, "hadoopJobId"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -106,6 +118,14 @@ public class ShowCompactResponseElement implements org.apache.thrift.TBase<ShowC return START; case 8: // RUN_AS return RUN_AS; + case 9: // HIGHTEST_TXN_ID + return HIGHTEST_TXN_ID; + case 10: // META_INFO + return META_INFO; + case 11: // END_TIME + return END_TIME; + case 12: // HADOOP_JOB_ID + return HADOOP_JOB_ID; default: return null; } @@ -147,8 +167,10 @@ public class ShowCompactResponseElement implements org.apache.thrift.TBase<ShowC // isset id assignments private static final int __START_ISSET_ID = 0; + private static final int __HIGHTESTTXNID_ISSET_ID = 1; + private static final int __ENDTIME_ISSET_ID = 2; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.PARTITIONNAME,_Fields.WORKERID,_Fields.START,_Fields.RUN_AS}; + private static final _Fields optionals[] = {_Fields.PARTITIONNAME,_Fields.WORKERID,_Fields.START,_Fields.RUN_AS,_Fields.HIGHTEST_TXN_ID,_Fields.META_INFO,_Fields.END_TIME,_Fields.HADOOP_JOB_ID}; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -168,11 +190,21 @@ public class ShowCompactResponseElement implements org.apache.thrift.TBase<ShowC new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); tmpMap.put(_Fields.RUN_AS, new org.apache.thrift.meta_data.FieldMetaData("runAs", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.HIGHTEST_TXN_ID, new org.apache.thrift.meta_data.FieldMetaData("hightestTxnId", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); + tmpMap.put(_Fields.META_INFO, new org.apache.thrift.meta_data.FieldMetaData("metaInfo", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.END_TIME, new org.apache.thrift.meta_data.FieldMetaData("endTime", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); + tmpMap.put(_Fields.HADOOP_JOB_ID, new org.apache.thrift.meta_data.FieldMetaData("hadoopJobId", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ShowCompactResponseElement.class, metaDataMap); } public ShowCompactResponseElement() { + this.hadoopJobId = "None"; + } public ShowCompactResponseElement( @@ -215,6 +247,14 @@ public class ShowCompactResponseElement implements org.apache.thrift.TBase<ShowC if (other.isSetRunAs()) { this.runAs = other.runAs; } + this.hightestTxnId = other.hightestTxnId; + if (other.isSetMetaInfo()) { + this.metaInfo = other.metaInfo; + } + this.endTime = other.endTime; + if (other.isSetHadoopJobId()) { + this.hadoopJobId = other.hadoopJobId; + } } public ShowCompactResponseElement deepCopy() { @@ -232,6 +272,13 @@ public class ShowCompactResponseElement implements org.apache.thrift.TBase<ShowC setStartIsSet(false); this.start = 0; this.runAs = null; + setHightestTxnIdIsSet(false); + this.hightestTxnId = 0; + this.metaInfo = null; + setEndTimeIsSet(false); + this.endTime = 0; + this.hadoopJobId = "None"; + } public String getDbname() { @@ -425,6 +472,96 @@ public class ShowCompactResponseElement implements org.apache.thrift.TBase<ShowC } } + public long getHightestTxnId() { + return this.hightestTxnId; + } + + public void setHightestTxnId(long hightestTxnId) { + this.hightestTxnId = hightestTxnId; + setHightestTxnIdIsSet(true); + } + + public void unsetHightestTxnId() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __HIGHTESTTXNID_ISSET_ID); + } + + /** Returns true if field hightestTxnId is set (has been assigned a value) and false otherwise */ + public boolean isSetHightestTxnId() { + return EncodingUtils.testBit(__isset_bitfield, __HIGHTESTTXNID_ISSET_ID); + } + + public void setHightestTxnIdIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __HIGHTESTTXNID_ISSET_ID, value); + } + + public String getMetaInfo() { + return this.metaInfo; + } + + public void setMetaInfo(String metaInfo) { + this.metaInfo = metaInfo; + } + + public void unsetMetaInfo() { + this.metaInfo = null; + } + + /** Returns true if field metaInfo is set (has been assigned a value) and false otherwise */ + public boolean isSetMetaInfo() { + return this.metaInfo != null; + } + + public void setMetaInfoIsSet(boolean value) { + if (!value) { + this.metaInfo = null; + } + } + + public long getEndTime() { + return this.endTime; + } + + public void setEndTime(long endTime) { + this.endTime = endTime; + setEndTimeIsSet(true); + } + + public void unsetEndTime() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ENDTIME_ISSET_ID); + } + + /** Returns true if field endTime is set (has been assigned a value) and false otherwise */ + public boolean isSetEndTime() { + return EncodingUtils.testBit(__isset_bitfield, __ENDTIME_ISSET_ID); + } + + public void setEndTimeIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ENDTIME_ISSET_ID, value); + } + + public String getHadoopJobId() { + return this.hadoopJobId; + } + + public void setHadoopJobId(String hadoopJobId) { + this.hadoopJobId = hadoopJobId; + } + + public void unsetHadoopJobId() { + this.hadoopJobId = null; + } + + /** Returns true if field hadoopJobId is set (has been assigned a value) and false otherwise */ + public boolean isSetHadoopJobId() { + return this.hadoopJobId != null; + } + + public void setHadoopJobIdIsSet(boolean value) { + if (!value) { + this.hadoopJobId = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case DBNAME: @@ -491,6 +628,38 @@ public class ShowCompactResponseElement implements org.apache.thrift.TBase<ShowC } break; + case HIGHTEST_TXN_ID: + if (value == null) { + unsetHightestTxnId(); + } else { + setHightestTxnId((Long)value); + } + break; + + case META_INFO: + if (value == null) { + unsetMetaInfo(); + } else { + setMetaInfo((String)value); + } + break; + + case END_TIME: + if (value == null) { + unsetEndTime(); + } else { + setEndTime((Long)value); + } + break; + + case HADOOP_JOB_ID: + if (value == null) { + unsetHadoopJobId(); + } else { + setHadoopJobId((String)value); + } + break; + } } @@ -515,11 +684,23 @@ public class ShowCompactResponseElement implements org.apache.thrift.TBase<ShowC return getWorkerid(); case START: - return Long.valueOf(getStart()); + return getStart(); case RUN_AS: return getRunAs(); + case HIGHTEST_TXN_ID: + return getHightestTxnId(); + + case META_INFO: + return getMetaInfo(); + + case END_TIME: + return getEndTime(); + + case HADOOP_JOB_ID: + return getHadoopJobId(); + } throw new IllegalStateException(); } @@ -547,6 +728,14 @@ public class ShowCompactResponseElement implements org.apache.thrift.TBase<ShowC return isSetStart(); case RUN_AS: return isSetRunAs(); + case HIGHTEST_TXN_ID: + return isSetHightestTxnId(); + case META_INFO: + return isSetMetaInfo(); + case END_TIME: + return isSetEndTime(); + case HADOOP_JOB_ID: + return isSetHadoopJobId(); } throw new IllegalStateException(); } @@ -636,6 +825,42 @@ public class ShowCompactResponseElement implements org.apache.thrift.TBase<ShowC return false; } + boolean this_present_hightestTxnId = true && this.isSetHightestTxnId(); + boolean that_present_hightestTxnId = true && that.isSetHightestTxnId(); + if (this_present_hightestTxnId || that_present_hightestTxnId) { + if (!(this_present_hightestTxnId && that_present_hightestTxnId)) + return false; + if (this.hightestTxnId != that.hightestTxnId) + return false; + } + + boolean this_present_metaInfo = true && this.isSetMetaInfo(); + boolean that_present_metaInfo = true && that.isSetMetaInfo(); + if (this_present_metaInfo || that_present_metaInfo) { + if (!(this_present_metaInfo && that_present_metaInfo)) + return false; + if (!this.metaInfo.equals(that.metaInfo)) + return false; + } + + boolean this_present_endTime = true && this.isSetEndTime(); + boolean that_present_endTime = true && that.isSetEndTime(); + if (this_present_endTime || that_present_endTime) { + if (!(this_present_endTime && that_present_endTime)) + return false; + if (this.endTime != that.endTime) + return false; + } + + boolean this_present_hadoopJobId = true && this.isSetHadoopJobId(); + boolean that_present_hadoopJobId = true && that.isSetHadoopJobId(); + if (this_present_hadoopJobId || that_present_hadoopJobId) { + if (!(this_present_hadoopJobId && that_present_hadoopJobId)) + return false; + if (!this.hadoopJobId.equals(that.hadoopJobId)) + return false; + } + return true; } @@ -683,6 +908,26 @@ public class ShowCompactResponseElement implements org.apache.thrift.TBase<ShowC if (present_runAs) list.add(runAs); + boolean present_hightestTxnId = true && (isSetHightestTxnId()); + list.add(present_hightestTxnId); + if (present_hightestTxnId) + list.add(hightestTxnId); + + boolean present_metaInfo = true && (isSetMetaInfo()); + list.add(present_metaInfo); + if (present_metaInfo) + list.add(metaInfo); + + boolean present_endTime = true && (isSetEndTime()); + list.add(present_endTime); + if (present_endTime) + list.add(endTime); + + boolean present_hadoopJobId = true && (isSetHadoopJobId()); + list.add(present_hadoopJobId); + if (present_hadoopJobId) + list.add(hadoopJobId); + return list.hashCode(); } @@ -774,6 +1019,46 @@ public class ShowCompactResponseElement implements org.apache.thrift.TBase<ShowC return lastComparison; } } + lastComparison = Boolean.valueOf(isSetHightestTxnId()).compareTo(other.isSetHightestTxnId()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetHightestTxnId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.hightestTxnId, other.hightestTxnId); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetMetaInfo()).compareTo(other.isSetMetaInfo()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetMetaInfo()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.metaInfo, other.metaInfo); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetEndTime()).compareTo(other.isSetEndTime()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetEndTime()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.endTime, other.endTime); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetHadoopJobId()).compareTo(other.isSetHadoopJobId()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetHadoopJobId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.hadoopJobId, other.hadoopJobId); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -861,6 +1146,38 @@ public class ShowCompactResponseElement implements org.apache.thrift.TBase<ShowC } first = false; } + if (isSetHightestTxnId()) { + if (!first) sb.append(", "); + sb.append("hightestTxnId:"); + sb.append(this.hightestTxnId); + first = false; + } + if (isSetMetaInfo()) { + if (!first) sb.append(", "); + sb.append("metaInfo:"); + if (this.metaInfo == null) { + sb.append("null"); + } else { + sb.append(this.metaInfo); + } + first = false; + } + if (isSetEndTime()) { + if (!first) sb.append(", "); + sb.append("endTime:"); + sb.append(this.endTime); + first = false; + } + if (isSetHadoopJobId()) { + if (!first) sb.append(", "); + sb.append("hadoopJobId:"); + if (this.hadoopJobId == null) { + sb.append("null"); + } else { + sb.append(this.hadoopJobId); + } + first = false; + } sb.append(")"); return sb.toString(); } @@ -986,6 +1303,38 @@ public class ShowCompactResponseElement implements org.apache.thrift.TBase<ShowC org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 9: // HIGHTEST_TXN_ID + if (schemeField.type == org.apache.thrift.protocol.TType.I64) { + struct.hightestTxnId = iprot.readI64(); + struct.setHightestTxnIdIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 10: // META_INFO + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.metaInfo = iprot.readString(); + struct.setMetaInfoIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 11: // END_TIME + if (schemeField.type == org.apache.thrift.protocol.TType.I64) { + struct.endTime = iprot.readI64(); + struct.setEndTimeIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 12: // HADOOP_JOB_ID + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.hadoopJobId = iprot.readString(); + struct.setHadoopJobIdIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1045,6 +1394,30 @@ public class ShowCompactResponseElement implements org.apache.thrift.TBase<ShowC oprot.writeFieldEnd(); } } + if (struct.isSetHightestTxnId()) { + oprot.writeFieldBegin(HIGHTEST_TXN_ID_FIELD_DESC); + oprot.writeI64(struct.hightestTxnId); + oprot.writeFieldEnd(); + } + if (struct.metaInfo != null) { + if (struct.isSetMetaInfo()) { + oprot.writeFieldBegin(META_INFO_FIELD_DESC); + oprot.writeString(struct.metaInfo); + oprot.writeFieldEnd(); + } + } + if (struct.isSetEndTime()) { + oprot.writeFieldBegin(END_TIME_FIELD_DESC); + oprot.writeI64(struct.endTime); + oprot.writeFieldEnd(); + } + if (struct.hadoopJobId != null) { + if (struct.isSetHadoopJobId()) { + oprot.writeFieldBegin(HADOOP_JOB_ID_FIELD_DESC); + oprot.writeString(struct.hadoopJobId); + oprot.writeFieldEnd(); + } + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -1079,7 +1452,19 @@ public class ShowCompactResponseElement implements org.apache.thrift.TBase<ShowC if (struct.isSetRunAs()) { optionals.set(3); } - oprot.writeBitSet(optionals, 4); + if (struct.isSetHightestTxnId()) { + optionals.set(4); + } + if (struct.isSetMetaInfo()) { + optionals.set(5); + } + if (struct.isSetEndTime()) { + optionals.set(6); + } + if (struct.isSetHadoopJobId()) { + optionals.set(7); + } + oprot.writeBitSet(optionals, 8); if (struct.isSetPartitionname()) { oprot.writeString(struct.partitionname); } @@ -1092,6 +1477,18 @@ public class ShowCompactResponseElement implements org.apache.thrift.TBase<ShowC if (struct.isSetRunAs()) { oprot.writeString(struct.runAs); } + if (struct.isSetHightestTxnId()) { + oprot.writeI64(struct.hightestTxnId); + } + if (struct.isSetMetaInfo()) { + oprot.writeString(struct.metaInfo); + } + if (struct.isSetEndTime()) { + oprot.writeI64(struct.endTime); + } + if (struct.isSetHadoopJobId()) { + oprot.writeString(struct.hadoopJobId); + } } @Override @@ -1105,7 +1502,7 @@ public class ShowCompactResponseElement implements org.apache.thrift.TBase<ShowC struct.setTypeIsSet(true); struct.state = iprot.readString(); struct.setStateIsSet(true); - BitSet incoming = iprot.readBitSet(4); + BitSet incoming = iprot.readBitSet(8); if (incoming.get(0)) { struct.partitionname = iprot.readString(); struct.setPartitionnameIsSet(true); @@ -1122,6 +1519,22 @@ public class ShowCompactResponseElement implements org.apache.thrift.TBase<ShowC struct.runAs = iprot.readString(); struct.setRunAsIsSet(true); } + if (incoming.get(4)) { + struct.hightestTxnId = iprot.readI64(); + struct.setHightestTxnIdIsSet(true); + } + if (incoming.get(5)) { + struct.metaInfo = iprot.readString(); + struct.setMetaInfoIsSet(true); + } + if (incoming.get(6)) { + struct.endTime = iprot.readI64(); + struct.setEndTimeIsSet(true); + } + if (incoming.get(7)) { + struct.hadoopJobId = iprot.readString(); + struct.setHadoopJobIdIsSet(true); + } } } http://git-wip-us.apache.org/repos/asf/hive/blob/92072ad2/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksRequest.java ---------------------------------------------------------------------- diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksRequest.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksRequest.java index 122c070..daa14bf 100644 --- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksRequest.java +++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksRequest.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -34,10 +34,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-14") public class ShowLocksRequest implements org.apache.thrift.TBase<ShowLocksRequest, ShowLocksRequest._Fields>, java.io.Serializable, Cloneable, Comparable<ShowLocksRequest> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ShowLocksRequest"); + private static final org.apache.thrift.protocol.TField DBNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("dbname", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField TABLENAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tablename", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField PARTNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("partname", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField IS_EXTENDED_FIELD_DESC = new org.apache.thrift.protocol.TField("isExtended", org.apache.thrift.protocol.TType.BOOL, (short)4); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -45,10 +49,17 @@ public class ShowLocksRequest implements org.apache.thrift.TBase<ShowLocksReques schemes.put(TupleScheme.class, new ShowLocksRequestTupleSchemeFactory()); } + private String dbname; // optional + private String tablename; // optional + private String partname; // optional + private boolean isExtended; // 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 { -; + DBNAME((short)1, "dbname"), + TABLENAME((short)2, "tablename"), + PARTNAME((short)3, "partname"), + IS_EXTENDED((short)4, "isExtended"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -63,6 +74,14 @@ public class ShowLocksRequest implements org.apache.thrift.TBase<ShowLocksReques */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { + case 1: // DBNAME + return DBNAME; + case 2: // TABLENAME + return TABLENAME; + case 3: // PARTNAME + return PARTNAME; + case 4: // IS_EXTENDED + return IS_EXTENDED; default: return null; } @@ -101,20 +120,46 @@ public class ShowLocksRequest implements org.apache.thrift.TBase<ShowLocksReques return _fieldName; } } + + // isset id assignments + private static final int __ISEXTENDED_ISSET_ID = 0; + private byte __isset_bitfield = 0; + private static final _Fields optionals[] = {_Fields.DBNAME,_Fields.TABLENAME,_Fields.PARTNAME,_Fields.IS_EXTENDED}; 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.DBNAME, new org.apache.thrift.meta_data.FieldMetaData("dbname", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TABLENAME, new org.apache.thrift.meta_data.FieldMetaData("tablename", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.PARTNAME, new org.apache.thrift.meta_data.FieldMetaData("partname", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.IS_EXTENDED, new org.apache.thrift.meta_data.FieldMetaData("isExtended", 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(ShowLocksRequest.class, metaDataMap); } public ShowLocksRequest() { + this.isExtended = false; + } /** * Performs a deep copy on <i>other</i>. */ public ShowLocksRequest(ShowLocksRequest other) { + __isset_bitfield = other.__isset_bitfield; + if (other.isSetDbname()) { + this.dbname = other.dbname; + } + if (other.isSetTablename()) { + this.tablename = other.tablename; + } + if (other.isSetPartname()) { + this.partname = other.partname; + } + this.isExtended = other.isExtended; } public ShowLocksRequest deepCopy() { @@ -123,15 +168,155 @@ public class ShowLocksRequest implements org.apache.thrift.TBase<ShowLocksReques @Override public void clear() { + this.dbname = null; + this.tablename = null; + this.partname = null; + this.isExtended = false; + + } + + public String getDbname() { + return this.dbname; + } + + public void setDbname(String dbname) { + this.dbname = dbname; + } + + public void unsetDbname() { + this.dbname = null; + } + + /** Returns true if field dbname is set (has been assigned a value) and false otherwise */ + public boolean isSetDbname() { + return this.dbname != null; + } + + public void setDbnameIsSet(boolean value) { + if (!value) { + this.dbname = null; + } + } + + public String getTablename() { + return this.tablename; + } + + public void setTablename(String tablename) { + this.tablename = tablename; + } + + public void unsetTablename() { + this.tablename = null; + } + + /** Returns true if field tablename is set (has been assigned a value) and false otherwise */ + public boolean isSetTablename() { + return this.tablename != null; + } + + public void setTablenameIsSet(boolean value) { + if (!value) { + this.tablename = null; + } + } + + public String getPartname() { + return this.partname; + } + + public void setPartname(String partname) { + this.partname = partname; + } + + public void unsetPartname() { + this.partname = null; + } + + /** Returns true if field partname is set (has been assigned a value) and false otherwise */ + public boolean isSetPartname() { + return this.partname != null; + } + + public void setPartnameIsSet(boolean value) { + if (!value) { + this.partname = null; + } + } + + public boolean isIsExtended() { + return this.isExtended; + } + + public void setIsExtended(boolean isExtended) { + this.isExtended = isExtended; + setIsExtendedIsSet(true); + } + + public void unsetIsExtended() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISEXTENDED_ISSET_ID); + } + + /** Returns true if field isExtended is set (has been assigned a value) and false otherwise */ + public boolean isSetIsExtended() { + return EncodingUtils.testBit(__isset_bitfield, __ISEXTENDED_ISSET_ID); + } + + public void setIsExtendedIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISEXTENDED_ISSET_ID, value); } public void setFieldValue(_Fields field, Object value) { switch (field) { + case DBNAME: + if (value == null) { + unsetDbname(); + } else { + setDbname((String)value); + } + break; + + case TABLENAME: + if (value == null) { + unsetTablename(); + } else { + setTablename((String)value); + } + break; + + case PARTNAME: + if (value == null) { + unsetPartname(); + } else { + setPartname((String)value); + } + break; + + case IS_EXTENDED: + if (value == null) { + unsetIsExtended(); + } else { + setIsExtended((Boolean)value); + } + break; + } } public Object getFieldValue(_Fields field) { switch (field) { + case DBNAME: + return getDbname(); + + case TABLENAME: + return getTablename(); + + case PARTNAME: + return getPartname(); + + case IS_EXTENDED: + return isIsExtended(); + } throw new IllegalStateException(); } @@ -143,6 +328,14 @@ public class ShowLocksRequest implements org.apache.thrift.TBase<ShowLocksReques } switch (field) { + case DBNAME: + return isSetDbname(); + case TABLENAME: + return isSetTablename(); + case PARTNAME: + return isSetPartname(); + case IS_EXTENDED: + return isSetIsExtended(); } throw new IllegalStateException(); } @@ -160,6 +353,42 @@ public class ShowLocksRequest implements org.apache.thrift.TBase<ShowLocksReques if (that == null) return false; + boolean this_present_dbname = true && this.isSetDbname(); + boolean that_present_dbname = true && that.isSetDbname(); + if (this_present_dbname || that_present_dbname) { + if (!(this_present_dbname && that_present_dbname)) + return false; + if (!this.dbname.equals(that.dbname)) + return false; + } + + boolean this_present_tablename = true && this.isSetTablename(); + boolean that_present_tablename = true && that.isSetTablename(); + if (this_present_tablename || that_present_tablename) { + if (!(this_present_tablename && that_present_tablename)) + return false; + if (!this.tablename.equals(that.tablename)) + return false; + } + + boolean this_present_partname = true && this.isSetPartname(); + boolean that_present_partname = true && that.isSetPartname(); + if (this_present_partname || that_present_partname) { + if (!(this_present_partname && that_present_partname)) + return false; + if (!this.partname.equals(that.partname)) + return false; + } + + boolean this_present_isExtended = true && this.isSetIsExtended(); + boolean that_present_isExtended = true && that.isSetIsExtended(); + if (this_present_isExtended || that_present_isExtended) { + if (!(this_present_isExtended && that_present_isExtended)) + return false; + if (this.isExtended != that.isExtended) + return false; + } + return true; } @@ -167,6 +396,26 @@ public class ShowLocksRequest implements org.apache.thrift.TBase<ShowLocksReques public int hashCode() { List<Object> list = new ArrayList<Object>(); + boolean present_dbname = true && (isSetDbname()); + list.add(present_dbname); + if (present_dbname) + list.add(dbname); + + boolean present_tablename = true && (isSetTablename()); + list.add(present_tablename); + if (present_tablename) + list.add(tablename); + + boolean present_partname = true && (isSetPartname()); + list.add(present_partname); + if (present_partname) + list.add(partname); + + boolean present_isExtended = true && (isSetIsExtended()); + list.add(present_isExtended); + if (present_isExtended) + list.add(isExtended); + return list.hashCode(); } @@ -178,6 +427,46 @@ public class ShowLocksRequest implements org.apache.thrift.TBase<ShowLocksReques int lastComparison = 0; + lastComparison = Boolean.valueOf(isSetDbname()).compareTo(other.isSetDbname()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetDbname()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dbname, other.dbname); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetTablename()).compareTo(other.isSetTablename()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetTablename()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tablename, other.tablename); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetPartname()).compareTo(other.isSetPartname()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetPartname()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.partname, other.partname); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetIsExtended()).compareTo(other.isSetIsExtended()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetIsExtended()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isExtended, other.isExtended); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -198,6 +487,41 @@ public class ShowLocksRequest implements org.apache.thrift.TBase<ShowLocksReques StringBuilder sb = new StringBuilder("ShowLocksRequest("); boolean first = true; + if (isSetDbname()) { + sb.append("dbname:"); + if (this.dbname == null) { + sb.append("null"); + } else { + sb.append(this.dbname); + } + first = false; + } + if (isSetTablename()) { + if (!first) sb.append(", "); + sb.append("tablename:"); + if (this.tablename == null) { + sb.append("null"); + } else { + sb.append(this.tablename); + } + first = false; + } + if (isSetPartname()) { + if (!first) sb.append(", "); + sb.append("partname:"); + if (this.partname == null) { + sb.append("null"); + } else { + sb.append(this.partname); + } + first = false; + } + if (isSetIsExtended()) { + if (!first) sb.append(", "); + sb.append("isExtended:"); + sb.append(this.isExtended); + first = false; + } sb.append(")"); return sb.toString(); } @@ -217,6 +541,8 @@ public class ShowLocksRequest implements org.apache.thrift.TBase<ShowLocksReques 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); @@ -241,6 +567,38 @@ public class ShowLocksRequest implements org.apache.thrift.TBase<ShowLocksReques break; } switch (schemeField.id) { + case 1: // DBNAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.dbname = iprot.readString(); + struct.setDbnameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 2: // TABLENAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.tablename = iprot.readString(); + struct.setTablenameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 3: // PARTNAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.partname = iprot.readString(); + struct.setPartnameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // IS_EXTENDED + if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { + struct.isExtended = iprot.readBool(); + struct.setIsExtendedIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -254,6 +612,32 @@ public class ShowLocksRequest implements org.apache.thrift.TBase<ShowLocksReques struct.validate(); oprot.writeStructBegin(STRUCT_DESC); + if (struct.dbname != null) { + if (struct.isSetDbname()) { + oprot.writeFieldBegin(DBNAME_FIELD_DESC); + oprot.writeString(struct.dbname); + oprot.writeFieldEnd(); + } + } + if (struct.tablename != null) { + if (struct.isSetTablename()) { + oprot.writeFieldBegin(TABLENAME_FIELD_DESC); + oprot.writeString(struct.tablename); + oprot.writeFieldEnd(); + } + } + if (struct.partname != null) { + if (struct.isSetPartname()) { + oprot.writeFieldBegin(PARTNAME_FIELD_DESC); + oprot.writeString(struct.partname); + oprot.writeFieldEnd(); + } + } + if (struct.isSetIsExtended()) { + oprot.writeFieldBegin(IS_EXTENDED_FIELD_DESC); + oprot.writeBool(struct.isExtended); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -271,11 +655,54 @@ public class ShowLocksRequest implements org.apache.thrift.TBase<ShowLocksReques @Override public void write(org.apache.thrift.protocol.TProtocol prot, ShowLocksRequest struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetDbname()) { + optionals.set(0); + } + if (struct.isSetTablename()) { + optionals.set(1); + } + if (struct.isSetPartname()) { + optionals.set(2); + } + if (struct.isSetIsExtended()) { + optionals.set(3); + } + oprot.writeBitSet(optionals, 4); + if (struct.isSetDbname()) { + oprot.writeString(struct.dbname); + } + if (struct.isSetTablename()) { + oprot.writeString(struct.tablename); + } + if (struct.isSetPartname()) { + oprot.writeString(struct.partname); + } + if (struct.isSetIsExtended()) { + oprot.writeBool(struct.isExtended); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, ShowLocksRequest struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(4); + if (incoming.get(0)) { + struct.dbname = iprot.readString(); + struct.setDbnameIsSet(true); + } + if (incoming.get(1)) { + struct.tablename = iprot.readString(); + struct.setTablenameIsSet(true); + } + if (incoming.get(2)) { + struct.partname = iprot.readString(); + struct.setPartnameIsSet(true); + } + if (incoming.get(3)) { + struct.isExtended = iprot.readBool(); + struct.setIsExtendedIsSet(true); + } } } http://git-wip-us.apache.org/repos/asf/hive/blob/92072ad2/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponse.java ---------------------------------------------------------------------- diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponse.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponse.java index 52b0bbc..6e8dd89 100644 --- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponse.java +++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponse.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-14") public class ShowLocksResponse implements org.apache.thrift.TBase<ShowLocksResponse, ShowLocksResponse._Fields>, java.io.Serializable, Cloneable, Comparable<ShowLocksResponse> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ShowLocksResponse"); http://git-wip-us.apache.org/repos/asf/hive/blob/92072ad2/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponseElement.java ---------------------------------------------------------------------- diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponseElement.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponseElement.java index 8be9b05..d5ea642 100644 --- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponseElement.java +++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponseElement.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-14") public class ShowLocksResponseElement implements org.apache.thrift.TBase<ShowLocksResponseElement, ShowLocksResponseElement._Fields>, java.io.Serializable, Cloneable, Comparable<ShowLocksResponseElement> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ShowLocksResponseElement"); @@ -49,6 +49,11 @@ public class ShowLocksResponseElement implements org.apache.thrift.TBase<ShowLoc private static final org.apache.thrift.protocol.TField ACQUIREDAT_FIELD_DESC = new org.apache.thrift.protocol.TField("acquiredat", org.apache.thrift.protocol.TType.I64, (short)9); private static final org.apache.thrift.protocol.TField USER_FIELD_DESC = new org.apache.thrift.protocol.TField("user", org.apache.thrift.protocol.TType.STRING, (short)10); private static final org.apache.thrift.protocol.TField HOSTNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("hostname", org.apache.thrift.protocol.TType.STRING, (short)11); + private static final org.apache.thrift.protocol.TField HEARTBEAT_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("heartbeatCount", org.apache.thrift.protocol.TType.I32, (short)12); + private static final org.apache.thrift.protocol.TField AGENT_INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("agentInfo", org.apache.thrift.protocol.TType.STRING, (short)13); + private static final org.apache.thrift.protocol.TField BLOCKED_BY_EXT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("blockedByExtId", org.apache.thrift.protocol.TType.I64, (short)14); + private static final org.apache.thrift.protocol.TField BLOCKED_BY_INT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("blockedByIntId", org.apache.thrift.protocol.TType.I64, (short)15); + private static final org.apache.thrift.protocol.TField LOCK_ID_INTERNAL_FIELD_DESC = new org.apache.thrift.protocol.TField("lockIdInternal", org.apache.thrift.protocol.TType.I64, (short)16); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -67,6 +72,11 @@ public class ShowLocksResponseElement implements org.apache.thrift.TBase<ShowLoc private long acquiredat; // optional private String user; // required private String hostname; // required + private int heartbeatCount; // optional + private String agentInfo; // optional + private long blockedByExtId; // optional + private long blockedByIntId; // optional + private long lockIdInternal; // 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 { @@ -88,7 +98,12 @@ public class ShowLocksResponseElement implements org.apache.thrift.TBase<ShowLoc LASTHEARTBEAT((short)8, "lastheartbeat"), ACQUIREDAT((short)9, "acquiredat"), USER((short)10, "user"), - HOSTNAME((short)11, "hostname"); + HOSTNAME((short)11, "hostname"), + HEARTBEAT_COUNT((short)12, "heartbeatCount"), + AGENT_INFO((short)13, "agentInfo"), + BLOCKED_BY_EXT_ID((short)14, "blockedByExtId"), + BLOCKED_BY_INT_ID((short)15, "blockedByIntId"), + LOCK_ID_INTERNAL((short)16, "lockIdInternal"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -125,6 +140,16 @@ public class ShowLocksResponseElement implements org.apache.thrift.TBase<ShowLoc return USER; case 11: // HOSTNAME return HOSTNAME; + case 12: // HEARTBEAT_COUNT + return HEARTBEAT_COUNT; + case 13: // AGENT_INFO + return AGENT_INFO; + case 14: // BLOCKED_BY_EXT_ID + return BLOCKED_BY_EXT_ID; + case 15: // BLOCKED_BY_INT_ID + return BLOCKED_BY_INT_ID; + case 16: // LOCK_ID_INTERNAL + return LOCK_ID_INTERNAL; default: return null; } @@ -169,8 +194,12 @@ public class ShowLocksResponseElement implements org.apache.thrift.TBase<ShowLoc private static final int __TXNID_ISSET_ID = 1; private static final int __LASTHEARTBEAT_ISSET_ID = 2; private static final int __ACQUIREDAT_ISSET_ID = 3; + private static final int __HEARTBEATCOUNT_ISSET_ID = 4; + private static final int __BLOCKEDBYEXTID_ISSET_ID = 5; + private static final int __BLOCKEDBYINTID_ISSET_ID = 6; + private static final int __LOCKIDINTERNAL_ISSET_ID = 7; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.TABLENAME,_Fields.PARTNAME,_Fields.TXNID,_Fields.ACQUIREDAT}; + private static final _Fields optionals[] = {_Fields.TABLENAME,_Fields.PARTNAME,_Fields.TXNID,_Fields.ACQUIREDAT,_Fields.HEARTBEAT_COUNT,_Fields.AGENT_INFO,_Fields.BLOCKED_BY_EXT_ID,_Fields.BLOCKED_BY_INT_ID,_Fields.LOCK_ID_INTERNAL}; 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); @@ -196,11 +225,23 @@ public class ShowLocksResponseElement implements org.apache.thrift.TBase<ShowLoc new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.HOSTNAME, new org.apache.thrift.meta_data.FieldMetaData("hostname", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.HEARTBEAT_COUNT, new org.apache.thrift.meta_data.FieldMetaData("heartbeatCount", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.AGENT_INFO, new org.apache.thrift.meta_data.FieldMetaData("agentInfo", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.BLOCKED_BY_EXT_ID, new org.apache.thrift.meta_data.FieldMetaData("blockedByExtId", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); + tmpMap.put(_Fields.BLOCKED_BY_INT_ID, new org.apache.thrift.meta_data.FieldMetaData("blockedByIntId", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); + tmpMap.put(_Fields.LOCK_ID_INTERNAL, new org.apache.thrift.meta_data.FieldMetaData("lockIdInternal", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ShowLocksResponseElement.class, metaDataMap); } public ShowLocksResponseElement() { + this.heartbeatCount = 0; + } public ShowLocksResponseElement( @@ -254,6 +295,13 @@ public class ShowLocksResponseElement implements org.apache.thrift.TBase<ShowLoc if (other.isSetHostname()) { this.hostname = other.hostname; } + this.heartbeatCount = other.heartbeatCount; + if (other.isSetAgentInfo()) { + this.agentInfo = other.agentInfo; + } + this.blockedByExtId = other.blockedByExtId; + this.blockedByIntId = other.blockedByIntId; + this.lockIdInternal = other.lockIdInternal; } public ShowLocksResponseElement deepCopy() { @@ -277,6 +325,15 @@ public class ShowLocksResponseElement implements org.apache.thrift.TBase<ShowLoc this.acquiredat = 0; this.user = null; this.hostname = null; + this.heartbeatCount = 0; + + this.agentInfo = null; + setBlockedByExtIdIsSet(false); + this.blockedByExtId = 0; + setBlockedByIntIdIsSet(false); + this.blockedByIntId = 0; + setLockIdInternalIsSet(false); + this.lockIdInternal = 0; } public long getLockid() { @@ -544,6 +601,117 @@ public class ShowLocksResponseElement implements org.apache.thrift.TBase<ShowLoc } } + public int getHeartbeatCount() { + return this.heartbeatCount; + } + + public void setHeartbeatCount(int heartbeatCount) { + this.heartbeatCount = heartbeatCount; + setHeartbeatCountIsSet(true); + } + + public void unsetHeartbeatCount() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __HEARTBEATCOUNT_ISSET_ID); + } + + /** Returns true if field heartbeatCount is set (has been assigned a value) and false otherwise */ + public boolean isSetHeartbeatCount() { + return EncodingUtils.testBit(__isset_bitfield, __HEARTBEATCOUNT_ISSET_ID); + } + + public void setHeartbeatCountIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __HEARTBEATCOUNT_ISSET_ID, value); + } + + public String getAgentInfo() { + return this.agentInfo; + } + + public void setAgentInfo(String agentInfo) { + this.agentInfo = agentInfo; + } + + public void unsetAgentInfo() { + this.agentInfo = null; + } + + /** Returns true if field agentInfo is set (has been assigned a value) and false otherwise */ + public boolean isSetAgentInfo() { + return this.agentInfo != null; + } + + public void setAgentInfoIsSet(boolean value) { + if (!value) { + this.agentInfo = null; + } + } + + public long getBlockedByExtId() { + return this.blockedByExtId; + } + + public void setBlockedByExtId(long blockedByExtId) { + this.blockedByExtId = blockedByExtId; + setBlockedByExtIdIsSet(true); + } + + public void unsetBlockedByExtId() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __BLOCKEDBYEXTID_ISSET_ID); + } + + /** Returns true if field blockedByExtId is set (has been assigned a value) and false otherwise */ + public boolean isSetBlockedByExtId() { + return EncodingUtils.testBit(__isset_bitfield, __BLOCKEDBYEXTID_ISSET_ID); + } + + public void setBlockedByExtIdIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __BLOCKEDBYEXTID_ISSET_ID, value); + } + + public long getBlockedByIntId() { + return this.blockedByIntId; + } + + public void setBlockedByIntId(long blockedByIntId) { + this.blockedByIntId = blockedByIntId; + setBlockedByIntIdIsSet(true); + } + + public void unsetBlockedByIntId() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __BLOCKEDBYINTID_ISSET_ID); + } + + /** Returns true if field blockedByIntId is set (has been assigned a value) and false otherwise */ + public boolean isSetBlockedByIntId() { + return EncodingUtils.testBit(__isset_bitfield, __BLOCKEDBYINTID_ISSET_ID); + } + + public void setBlockedByIntIdIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __BLOCKEDBYINTID_ISSET_ID, value); + } + + public long getLockIdInternal() { + return this.lockIdInternal; + } + + public void setLockIdInternal(long lockIdInternal) { + this.lockIdInternal = lockIdInternal; + setLockIdInternalIsSet(true); + } + + public void unsetLockIdInternal() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __LOCKIDINTERNAL_ISSET_ID); + } + + /** Returns true if field lockIdInternal is set (has been assigned a value) and false otherwise */ + public boolean isSetLockIdInternal() { + return EncodingUtils.testBit(__isset_bitfield, __LOCKIDINTERNAL_ISSET_ID); + } + + public void setLockIdInternalIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LOCKIDINTERNAL_ISSET_ID, value); + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case LOCKID: @@ -634,13 +802,53 @@ public class ShowLocksResponseElement implements org.apache.thrift.TBase<ShowLoc } break; + case HEARTBEAT_COUNT: + if (value == null) { + unsetHeartbeatCount(); + } else { + setHeartbeatCount((Integer)value); + } + break; + + case AGENT_INFO: + if (value == null) { + unsetAgentInfo(); + } else { + setAgentInfo((String)value); + } + break; + + case BLOCKED_BY_EXT_ID: + if (value == null) { + unsetBlockedByExtId(); + } else { + setBlockedByExtId((Long)value); + } + break; + + case BLOCKED_BY_INT_ID: + if (value == null) { + unsetBlockedByIntId(); + } else { + setBlockedByIntId((Long)value); + } + break; + + case LOCK_ID_INTERNAL: + if (value == null) { + unsetLockIdInternal(); + } else { + setLockIdInternal((Long)value); + } + break; + } } public Object getFieldValue(_Fields field) { switch (field) { case LOCKID: - return Long.valueOf(getLockid()); + return getLockid(); case DBNAME: return getDbname(); @@ -658,13 +866,13 @@ public class ShowLocksResponseElement implements org.apache.thrift.TBase<ShowLoc return getType(); case TXNID: - return Long.valueOf(getTxnid()); + return getTxnid(); case LASTHEARTBEAT: - return Long.valueOf(getLastheartbeat()); + return getLastheartbeat(); case ACQUIREDAT: - return Long.valueOf(getAcquiredat()); + return getAcquiredat(); case USER: return getUser(); @@ -672,6 +880,21 @@ public class ShowLocksResponseElement implements org.apache.thrift.TBase<ShowLoc case HOSTNAME: return getHostname(); + case HEARTBEAT_COUNT: + return getHeartbeatCount(); + + case AGENT_INFO: + return getAgentInfo(); + + case BLOCKED_BY_EXT_ID: + return getBlockedByExtId(); + + case BLOCKED_BY_INT_ID: + return getBlockedByIntId(); + + case LOCK_ID_INTERNAL: + return getLockIdInternal(); + } throw new IllegalStateException(); } @@ -705,6 +928,16 @@ public class ShowLocksResponseElement implements org.apache.thrift.TBase<ShowLoc return isSetUser(); case HOSTNAME: return isSetHostname(); + case HEARTBEAT_COUNT: + return isSetHeartbeatCount(); + case AGENT_INFO: + return isSetAgentInfo(); + case BLOCKED_BY_EXT_ID: + return isSetBlockedByExtId(); + case BLOCKED_BY_INT_ID: + return isSetBlockedByIntId(); + case LOCK_ID_INTERNAL: + return isSetLockIdInternal(); } throw new IllegalStateException(); } @@ -821,6 +1054,51 @@ public class ShowLocksResponseElement implements org.apache.thrift.TBase<ShowLoc return false; } + boolean this_present_heartbeatCount = true && this.isSetHeartbeatCount(); + boolean that_present_heartbeatCount = true && that.isSetHeartbeatCount(); + if (this_present_heartbeatCount || that_present_heartbeatCount) { + if (!(this_present_heartbeatCount && that_present_heartbeatCount)) + return false; + if (this.heartbeatCount != that.heartbeatCount) + return false; + } + + boolean this_present_agentInfo = true && this.isSetAgentInfo(); + boolean that_present_agentInfo = true && that.isSetAgentInfo(); + if (this_present_agentInfo || that_present_agentInfo) { + if (!(this_present_agentInfo && that_present_agentInfo)) + return false; + if (!this.agentInfo.equals(that.agentInfo)) + return false; + } + + boolean this_present_blockedByExtId = true && this.isSetBlockedByExtId(); + boolean that_present_blockedByExtId = true && that.isSetBlockedByExtId(); + if (this_present_blockedByExtId || that_present_blockedByExtId) { + if (!(this_present_blockedByExtId && that_present_blockedByExtId)) + return false; + if (this.blockedByExtId != that.blockedByExtId) + return false; + } + + boolean this_present_blockedByIntId = true && this.isSetBlockedByIntId(); + boolean that_present_blockedByIntId = true && that.isSetBlockedByIntId(); + if (this_present_blockedByIntId || that_present_blockedByIntId) { + if (!(this_present_blockedByIntId && that_present_blockedByIntId)) + return false; + if (this.blockedByIntId != that.blockedByIntId) + return false; + } + + boolean this_present_lockIdInternal = true && this.isSetLockIdInternal(); + boolean that_present_lockIdInternal = true && that.isSetLockIdInternal(); + if (this_present_lockIdInternal || that_present_lockIdInternal) { + if (!(this_present_lockIdInternal && that_present_lockIdInternal)) + return false; + if (this.lockIdInternal != that.lockIdInternal) + return false; + } + return true; } @@ -883,6 +1161,31 @@ public class ShowLocksResponseElement implements org.apache.thrift.TBase<ShowLoc if (present_hostname) list.add(hostname); + boolean present_heartbeatCount = true && (isSetHeartbeatCount()); + list.add(present_heartbeatCount); + if (present_heartbeatCount) + list.add(heartbeatCount); + + boolean present_agentInfo = true && (isSetAgentInfo()); + list.add(present_agentInfo); + if (present_agentInfo) + list.add(agentInfo); + + boolean present_blockedByExtId = true && (isSetBlockedByExtId()); + list.add(present_blockedByExtId); + if (present_blockedByExtId) + list.add(blockedByExtId); + + boolean present_blockedByIntId = true && (isSetBlockedByIntId()); + list.add(present_blockedByIntId); + if (present_blockedByIntId) + list.add(blockedByIntId); + + boolean present_lockIdInternal = true && (isSetLockIdInternal()); + list.add(present_lockIdInternal); + if (present_lockIdInternal) + list.add(lockIdInternal); + return list.hashCode(); } @@ -1004,6 +1307,56 @@ public class ShowLocksResponseElement implements org.apache.thrift.TBase<ShowLoc return lastComparison; } } + lastComparison = Boolean.valueOf(isSetHeartbeatCount()).compareTo(other.isSetHeartbeatCount()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetHeartbeatCount()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.heartbeatCount, other.heartbeatCount); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetAgentInfo()).compareTo(other.isSetAgentInfo()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetAgentInfo()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.agentInfo, other.agentInfo); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetBlockedByExtId()).compareTo(other.isSetBlockedByExtId()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetBlockedByExtId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.blockedByExtId, other.blockedByExtId); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetBlockedByIntId()).compareTo(other.isSetBlockedByIntId()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetBlockedByIntId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.blockedByIntId, other.blockedByIntId); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetLockIdInternal()).compareTo(other.isSetLockIdInternal()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetLockIdInternal()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lockIdInternal, other.lockIdInternal); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -1103,6 +1456,40 @@ public class ShowLocksResponseElement implements org.apache.thrift.TBase<ShowLoc sb.append(this.hostname); } first = false; + if (isSetHeartbeatCount()) { + if (!first) sb.append(", "); + sb.append("heartbeatCount:"); + sb.append(this.heartbeatCount); + first = false; + } + if (isSetAgentInfo()) { + if (!first) sb.append(", "); + sb.append("agentInfo:"); + if (this.agentInfo == null) { + sb.append("null"); + } else { + sb.append(this.agentInfo); + } + first = false; + } + if (isSetBlockedByExtId()) { + if (!first) sb.append(", "); + sb.append("blockedByExtId:"); + sb.append(this.blockedByExtId); + first = false; + } + if (isSetBlockedByIntId()) { + if (!first) sb.append(", "); + sb.append("blockedByIntId:"); + sb.append(this.blockedByIntId); + first = false; + } + if (isSetLockIdInternal()) { + if (!first) sb.append(", "); + sb.append("lockIdInternal:"); + sb.append(this.lockIdInternal); + first = false; + } sb.append(")"); return sb.toString(); } @@ -1264,6 +1651,46 @@ public class ShowLocksResponseElement implements org.apache.thrift.TBase<ShowLoc org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 12: // HEARTBEAT_COUNT + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + struct.heartbeatCount = iprot.readI32(); + struct.setHeartbeatCountIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 13: // AGENT_INFO + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.agentInfo = iprot.readString(); + struct.setAgentInfoIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 14: // BLOCKED_BY_EXT_ID + if (schemeField.type == org.apache.thrift.protocol.TType.I64) { + struct.blockedByExtId = iprot.readI64(); + struct.setBlockedByExtIdIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 15: // BLOCKED_BY_INT_ID + if (schemeField.type == org.apache.thrift.protocol.TType.I64) { + struct.blockedByIntId = iprot.readI64(); + struct.setBlockedByIntIdIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 16: // LOCK_ID_INTERNAL + if (schemeField.type == org.apache.thrift.protocol.TType.I64) { + struct.lockIdInternal = iprot.readI64(); + struct.setLockIdInternalIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1332,6 +1759,33 @@ public class ShowLocksResponseElement implements org.apache.thrift.TBase<ShowLoc oprot.writeString(struct.hostname); oprot.writeFieldEnd(); } + if (struct.isSetHeartbeatCount()) { + oprot.writeFieldBegin(HEARTBEAT_COUNT_FIELD_DESC); + oprot.writeI32(struct.heartbeatCount); + oprot.writeFieldEnd(); + } + if (struct.agentInfo != null) { + if (struct.isSetAgentInfo()) { + oprot.writeFieldBegin(AGENT_INFO_FIELD_DESC); + oprot.writeString(struct.agentInfo); + oprot.writeFieldEnd(); + } + } + if (struct.isSetBlockedByExtId()) { + oprot.writeFieldBegin(BLOCKED_BY_EXT_ID_FIELD_DESC); + oprot.writeI64(struct.blockedByExtId); + oprot.writeFieldEnd(); + } + if (struct.isSetBlockedByIntId()) { + oprot.writeFieldBegin(BLOCKED_BY_INT_ID_FIELD_DESC); + oprot.writeI64(struct.blockedByIntId); + oprot.writeFieldEnd(); + } + if (struct.isSetLockIdInternal()) { + oprot.writeFieldBegin(LOCK_ID_INTERNAL_FIELD_DESC); + oprot.writeI64(struct.lockIdInternal); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -1369,7 +1823,22 @@ public class ShowLocksResponseElement implements org.apache.thrift.TBase<ShowLoc if (struct.isSetAcquiredat()) { optionals.set(3); } - oprot.writeBitSet(optionals, 4); + if (struct.isSetHeartbeatCount()) { + optionals.set(4); + } + if (struct.isSetAgentInfo()) { + optionals.set(5); + } + if (struct.isSetBlockedByExtId()) { + optionals.set(6); + } + if (struct.isSetBlockedByIntId()) { + optionals.set(7); + } + if (struct.isSetLockIdInternal()) { + optionals.set(8); + } + oprot.writeBitSet(optionals, 9); if (struct.isSetTablename()) { oprot.writeString(struct.tablename); } @@ -1382,6 +1851,21 @@ public class ShowLocksResponseElement implements org.apache.thrift.TBase<ShowLoc if (struct.isSetAcquiredat()) { oprot.writeI64(struct.acquiredat); } + if (struct.isSetHeartbeatCount()) { + oprot.writeI32(struct.heartbeatCount); + } + if (struct.isSetAgentInfo()) { + oprot.writeString(struct.agentInfo); + } + if (struct.isSetBlockedByExtId()) { + oprot.writeI64(struct.blockedByExtId); + } + if (struct.isSetBlockedByIntId()) { + oprot.writeI64(struct.blockedByIntId); + } + if (struct.isSetLockIdInternal()) { + oprot.writeI64(struct.lockIdInternal); + } } @Override @@ -1401,7 +1885,7 @@ public class ShowLocksResponseElement implements org.apache.thrift.TBase<ShowLoc struct.setUserIsSet(true); struct.hostname = iprot.readString(); struct.setHostnameIsSet(true); - BitSet incoming = iprot.readBitSet(4); + BitSet incoming = iprot.readBitSet(9); if (incoming.get(0)) { struct.tablename = iprot.readString(); struct.setTablenameIsSet(true); @@ -1418,6 +1902,26 @@ public class ShowLocksResponseElement implements org.apache.thrift.TBase<ShowLoc struct.acquiredat = iprot.readI64(); struct.setAcquiredatIsSet(true); } + if (incoming.get(4)) { + struct.heartbeatCount = iprot.readI32(); + struct.setHeartbeatCountIsSet(true); + } + if (incoming.get(5)) { + struct.agentInfo = iprot.readString(); + struct.setAgentInfoIsSet(true); + } + if (incoming.get(6)) { + struct.blockedByExtId = iprot.readI64(); + struct.setBlockedByExtIdIsSet(true); + } + if (incoming.get(7)) { + struct.blockedByIntId = iprot.readI64(); + struct.setBlockedByIntIdIsSet(true); + } + if (incoming.get(8)) { + struct.lockIdInternal = iprot.readI64(); + struct.setLockIdInternalIsSet(true); + } } } http://git-wip-us.apache.org/repos/asf/hive/blob/92072ad2/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SkewedInfo.java ---------------------------------------------------------------------- diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SkewedInfo.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SkewedInfo.java index bc64495..21d577c 100644 --- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SkewedInfo.java +++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SkewedInfo.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-14") public class SkewedInfo implements org.apache.thrift.TBase<SkewedInfo, SkewedInfo._Fields>, java.io.Serializable, Cloneable, Comparable<SkewedInfo> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SkewedInfo"); http://git-wip-us.apache.org/repos/asf/hive/blob/92072ad2/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java ---------------------------------------------------------------------- diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java index 165a879..72fe06d 100644 --- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java +++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-14") public class StorageDescriptor implements org.apache.thrift.TBase<StorageDescriptor, StorageDescriptor._Fields>, java.io.Serializable, Cloneable, Comparable<StorageDescriptor> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StorageDescriptor"); @@ -748,10 +748,10 @@ public class StorageDescriptor implements org.apache.thrift.TBase<StorageDescrip return getOutputFormat(); case COMPRESSED: - return Boolean.valueOf(isCompressed()); + return isCompressed(); case NUM_BUCKETS: - return Integer.valueOf(getNumBuckets()); + return getNumBuckets(); case SERDE_INFO: return getSerdeInfo(); @@ -769,7 +769,7 @@ public class StorageDescriptor implements org.apache.thrift.TBase<StorageDescrip return getSkewedInfo(); case STORED_AS_SUB_DIRECTORIES: - return Boolean.valueOf(isStoredAsSubDirectories()); + return isStoredAsSubDirectories(); } throw new IllegalStateException();
