commit fe52b41abb772209d6262e1300967db4e294b8f7 Author: Alan Gates Date: Sat Jan 9 08:23:12 2016 -0800 HIVE-12830 Thrift changes for HIVE-11793 diff --git metastore/if/hive_metastore.thrift metastore/if/hive_metastore.thrift index f98aa6e..f4d2a8b 100755 --- metastore/if/hive_metastore.thrift +++ metastore/if/hive_metastore.thrift @@ -609,6 +609,10 @@ struct UnlockRequest { } struct ShowLocksRequest { + 1: optional string dbname, + 2: optional string tablename, + 3: optional string partname, + 4: optional bool isExtended=false, } struct ShowLocksResponseElement { diff --git metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp index 917df27..1c81fef 100644 --- metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp +++ metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp @@ -11591,6 +11591,26 @@ ShowLocksRequest::~ShowLocksRequest() throw() { } +void ShowLocksRequest::__set_dbname(const std::string& val) { + this->dbname = val; +__isset.dbname = true; +} + +void ShowLocksRequest::__set_tablename(const std::string& val) { + this->tablename = val; +__isset.tablename = true; +} + +void ShowLocksRequest::__set_partname(const std::string& val) { + this->partname = val; +__isset.partname = true; +} + +void ShowLocksRequest::__set_isExtended(const bool val) { + this->isExtended = val; +__isset.isExtended = true; +} + uint32_t ShowLocksRequest::read(::apache::thrift::protocol::TProtocol* iprot) { apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); @@ -11610,7 +11630,44 @@ uint32_t ShowLocksRequest::read(::apache::thrift::protocol::TProtocol* iprot) { if (ftype == ::apache::thrift::protocol::T_STOP) { break; } - xfer += iprot->skip(ftype); + switch (fid) + { + case 1: + if (ftype == ::apache::thrift::protocol::T_STRING) { + xfer += iprot->readString(this->dbname); + this->__isset.dbname = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 2: + if (ftype == ::apache::thrift::protocol::T_STRING) { + xfer += iprot->readString(this->tablename); + this->__isset.tablename = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 3: + if (ftype == ::apache::thrift::protocol::T_STRING) { + xfer += iprot->readString(this->partname); + this->__isset.partname = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 4: + if (ftype == ::apache::thrift::protocol::T_BOOL) { + xfer += iprot->readBool(this->isExtended); + this->__isset.isExtended = true; + } else { + xfer += iprot->skip(ftype); + } + break; + default: + xfer += iprot->skip(ftype); + break; + } xfer += iprot->readFieldEnd(); } @@ -11624,6 +11681,26 @@ uint32_t ShowLocksRequest::write(::apache::thrift::protocol::TProtocol* oprot) c apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); xfer += oprot->writeStructBegin("ShowLocksRequest"); + if (this->__isset.dbname) { + xfer += oprot->writeFieldBegin("dbname", ::apache::thrift::protocol::T_STRING, 1); + xfer += oprot->writeString(this->dbname); + xfer += oprot->writeFieldEnd(); + } + if (this->__isset.tablename) { + xfer += oprot->writeFieldBegin("tablename", ::apache::thrift::protocol::T_STRING, 2); + xfer += oprot->writeString(this->tablename); + xfer += oprot->writeFieldEnd(); + } + if (this->__isset.partname) { + xfer += oprot->writeFieldBegin("partname", ::apache::thrift::protocol::T_STRING, 3); + xfer += oprot->writeString(this->partname); + xfer += oprot->writeFieldEnd(); + } + if (this->__isset.isExtended) { + xfer += oprot->writeFieldBegin("isExtended", ::apache::thrift::protocol::T_BOOL, 4); + xfer += oprot->writeBool(this->isExtended); + xfer += oprot->writeFieldEnd(); + } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); return xfer; @@ -11631,20 +11708,35 @@ uint32_t ShowLocksRequest::write(::apache::thrift::protocol::TProtocol* oprot) c void swap(ShowLocksRequest &a, ShowLocksRequest &b) { using ::std::swap; - (void) a; - (void) b; + swap(a.dbname, b.dbname); + swap(a.tablename, b.tablename); + swap(a.partname, b.partname); + swap(a.isExtended, b.isExtended); + swap(a.__isset, b.__isset); } ShowLocksRequest::ShowLocksRequest(const ShowLocksRequest& other517) { - (void) other517; + dbname = other517.dbname; + tablename = other517.tablename; + partname = other517.partname; + isExtended = other517.isExtended; + __isset = other517.__isset; } ShowLocksRequest& ShowLocksRequest::operator=(const ShowLocksRequest& other518) { - (void) other518; + dbname = other518.dbname; + tablename = other518.tablename; + partname = other518.partname; + isExtended = other518.isExtended; + __isset = other518.__isset; return *this; } void ShowLocksRequest::printTo(std::ostream& out) const { using ::apache::thrift::to_string; out << "ShowLocksRequest("; + out << "dbname="; (__isset.dbname ? (out << to_string(dbname)) : (out << "")); + out << ", " << "tablename="; (__isset.tablename ? (out << to_string(tablename)) : (out << "")); + out << ", " << "partname="; (__isset.partname ? (out << to_string(partname)) : (out << "")); + out << ", " << "isExtended="; (__isset.isExtended ? (out << to_string(isExtended)) : (out << "")); out << ")"; } diff --git metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h index 7755843..56e90cd 100644 --- metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h +++ metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h @@ -4749,19 +4749,56 @@ inline std::ostream& operator<<(std::ostream& out, const UnlockRequest& obj) return out; } +typedef struct _ShowLocksRequest__isset { + _ShowLocksRequest__isset() : dbname(false), tablename(false), partname(false), isExtended(true) {} + bool dbname :1; + bool tablename :1; + bool partname :1; + bool isExtended :1; +} _ShowLocksRequest__isset; class ShowLocksRequest { public: ShowLocksRequest(const ShowLocksRequest&); ShowLocksRequest& operator=(const ShowLocksRequest&); - ShowLocksRequest() { + ShowLocksRequest() : dbname(), tablename(), partname(), isExtended(false) { } virtual ~ShowLocksRequest() throw(); + std::string dbname; + std::string tablename; + std::string partname; + bool isExtended; + + _ShowLocksRequest__isset __isset; + + void __set_dbname(const std::string& val); + + void __set_tablename(const std::string& val); + + void __set_partname(const std::string& val); + + void __set_isExtended(const bool val); - bool operator == (const ShowLocksRequest & /* rhs */) const + bool operator == (const ShowLocksRequest & rhs) const { + if (__isset.dbname != rhs.__isset.dbname) + return false; + else if (__isset.dbname && !(dbname == rhs.dbname)) + return false; + if (__isset.tablename != rhs.__isset.tablename) + return false; + else if (__isset.tablename && !(tablename == rhs.tablename)) + return false; + if (__isset.partname != rhs.__isset.partname) + return false; + else if (__isset.partname && !(partname == rhs.partname)) + return false; + if (__isset.isExtended != rhs.__isset.isExtended) + return false; + else if (__isset.isExtended && !(isExtended == rhs.isExtended)) + return false; return true; } bool operator != (const ShowLocksRequest &rhs) const { diff --git metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksRequest.java metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksRequest.java index e89b93b..f566d6f 100644 --- metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksRequest.java +++ metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksRequest.java @@ -38,6 +38,10 @@ public class ShowLocksRequest implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { 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, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -45,10 +49,17 @@ 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 byName = new HashMap(); @@ -63,6 +74,14 @@ */ 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 String getFieldName() { 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 other. */ 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 ShowLocksRequest deepCopy() { @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 boolean isSet(_Fields field) { } 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 boolean equals(ShowLocksRequest that) { 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 boolean equals(ShowLocksRequest that) { public int hashCode() { List list = new ArrayList(); + 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 int compareTo(ShowLocksRequest other) { 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 String toString() { 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 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept 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 void read(org.apache.thrift.protocol.TProtocol iprot, ShowLocksRequest st 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 void write(org.apache.thrift.protocol.TProtocol oprot, ShowLocksRequest s 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 ShowLocksRequestTupleScheme getScheme() { @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); + } } } diff --git metastore/src/gen/thrift/gen-php/metastore/Types.php metastore/src/gen/thrift/gen-php/metastore/Types.php index 297a1c2..4a42d22 100644 --- metastore/src/gen/thrift/gen-php/metastore/Types.php +++ metastore/src/gen/thrift/gen-php/metastore/Types.php @@ -11591,12 +11591,58 @@ class UnlockRequest { class ShowLocksRequest { static $_TSPEC; + /** + * @var string + */ + public $dbname = null; + /** + * @var string + */ + public $tablename = null; + /** + * @var string + */ + public $partname = null; + /** + * @var bool + */ + public $isExtended = false; - public function __construct() { + public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { self::$_TSPEC = array( + 1 => array( + 'var' => 'dbname', + 'type' => TType::STRING, + ), + 2 => array( + 'var' => 'tablename', + 'type' => TType::STRING, + ), + 3 => array( + 'var' => 'partname', + 'type' => TType::STRING, + ), + 4 => array( + 'var' => 'isExtended', + 'type' => TType::BOOL, + ), ); } + if (is_array($vals)) { + if (isset($vals['dbname'])) { + $this->dbname = $vals['dbname']; + } + if (isset($vals['tablename'])) { + $this->tablename = $vals['tablename']; + } + if (isset($vals['partname'])) { + $this->partname = $vals['partname']; + } + if (isset($vals['isExtended'])) { + $this->isExtended = $vals['isExtended']; + } + } } public function getName() { @@ -11618,6 +11664,34 @@ class ShowLocksRequest { } switch ($fid) { + case 1: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->dbname); + } else { + $xfer += $input->skip($ftype); + } + break; + case 2: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->tablename); + } else { + $xfer += $input->skip($ftype); + } + break; + case 3: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->partname); + } else { + $xfer += $input->skip($ftype); + } + break; + case 4: + if ($ftype == TType::BOOL) { + $xfer += $input->readBool($this->isExtended); + } else { + $xfer += $input->skip($ftype); + } + break; default: $xfer += $input->skip($ftype); break; @@ -11631,6 +11705,26 @@ class ShowLocksRequest { public function write($output) { $xfer = 0; $xfer += $output->writeStructBegin('ShowLocksRequest'); + if ($this->dbname !== null) { + $xfer += $output->writeFieldBegin('dbname', TType::STRING, 1); + $xfer += $output->writeString($this->dbname); + $xfer += $output->writeFieldEnd(); + } + if ($this->tablename !== null) { + $xfer += $output->writeFieldBegin('tablename', TType::STRING, 2); + $xfer += $output->writeString($this->tablename); + $xfer += $output->writeFieldEnd(); + } + if ($this->partname !== null) { + $xfer += $output->writeFieldBegin('partname', TType::STRING, 3); + $xfer += $output->writeString($this->partname); + $xfer += $output->writeFieldEnd(); + } + if ($this->isExtended !== null) { + $xfer += $output->writeFieldBegin('isExtended', TType::BOOL, 4); + $xfer += $output->writeBool($this->isExtended); + $xfer += $output->writeFieldEnd(); + } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; diff --git metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py index 28d758c..baeeca1 100644 --- metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py +++ metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py @@ -8059,10 +8059,28 @@ def __ne__(self, other): return not (self == other) class ShowLocksRequest: + """ + Attributes: + - dbname + - tablename + - partname + - isExtended + """ thrift_spec = ( + None, # 0 + (1, TType.STRING, 'dbname', None, None, ), # 1 + (2, TType.STRING, 'tablename', None, None, ), # 2 + (3, TType.STRING, 'partname', None, None, ), # 3 + (4, TType.BOOL, 'isExtended', None, False, ), # 4 ) + def __init__(self, dbname=None, tablename=None, partname=None, isExtended=thrift_spec[4][4],): + self.dbname = dbname + self.tablename = tablename + self.partname = partname + self.isExtended = isExtended + def read(self, iprot): if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None: fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec)) @@ -8072,6 +8090,26 @@ def read(self, iprot): (fname, ftype, fid) = iprot.readFieldBegin() if ftype == TType.STOP: break + if fid == 1: + if ftype == TType.STRING: + self.dbname = iprot.readString() + else: + iprot.skip(ftype) + elif fid == 2: + if ftype == TType.STRING: + self.tablename = iprot.readString() + else: + iprot.skip(ftype) + elif fid == 3: + if ftype == TType.STRING: + self.partname = iprot.readString() + else: + iprot.skip(ftype) + elif fid == 4: + if ftype == TType.BOOL: + self.isExtended = iprot.readBool() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -8082,6 +8120,22 @@ def write(self, oprot): oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec))) return oprot.writeStructBegin('ShowLocksRequest') + if self.dbname is not None: + oprot.writeFieldBegin('dbname', TType.STRING, 1) + oprot.writeString(self.dbname) + oprot.writeFieldEnd() + if self.tablename is not None: + oprot.writeFieldBegin('tablename', TType.STRING, 2) + oprot.writeString(self.tablename) + oprot.writeFieldEnd() + if self.partname is not None: + oprot.writeFieldBegin('partname', TType.STRING, 3) + oprot.writeString(self.partname) + oprot.writeFieldEnd() + if self.isExtended is not None: + oprot.writeFieldBegin('isExtended', TType.BOOL, 4) + oprot.writeBool(self.isExtended) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -8091,6 +8145,10 @@ def validate(self): def __hash__(self): value = 17 + value = (value * 31) ^ hash(self.dbname) + value = (value * 31) ^ hash(self.tablename) + value = (value * 31) ^ hash(self.partname) + value = (value * 31) ^ hash(self.isExtended) return value def __repr__(self): diff --git metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb index 86cd237..b29650f 100644 --- metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb +++ metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb @@ -1826,9 +1826,16 @@ end class ShowLocksRequest include ::Thrift::Struct, ::Thrift::Struct_Union + DBNAME = 1 + TABLENAME = 2 + PARTNAME = 3 + ISEXTENDED = 4 FIELDS = { - + DBNAME => {:type => ::Thrift::Types::STRING, :name => 'dbname', :optional => true}, + TABLENAME => {:type => ::Thrift::Types::STRING, :name => 'tablename', :optional => true}, + PARTNAME => {:type => ::Thrift::Types::STRING, :name => 'partname', :optional => true}, + ISEXTENDED => {:type => ::Thrift::Types::BOOL, :name => 'isExtended', :default => false, :optional => true} } def struct_fields; FIELDS; end