Modified: hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h?rev=1657387&r1=1657386&r2=1657387&view=diff ============================================================================== --- hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h (original) +++ hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h Wed Feb 4 19:24:12 2015 @@ -135,7 +135,7 @@ class ThriftHiveMetastoreIf : virtual pu virtual void show_compact(ShowCompactResponse& _return, const ShowCompactRequest& rqst) = 0; virtual void get_next_notification(NotificationEventResponse& _return, const NotificationEventRequest& rqst) = 0; virtual void get_current_notificationEventId(CurrentNotificationEventId& _return) = 0; - virtual void fire_notification_event(const FireEventRequest& rqst) = 0; + virtual void fire_listener_event(FireEventResponse& _return, const FireEventRequest& rqst) = 0; }; class ThriftHiveMetastoreIfFactory : virtual public ::facebook::fb303::FacebookServiceIfFactory { @@ -545,7 +545,7 @@ class ThriftHiveMetastoreNull : virtual void get_current_notificationEventId(CurrentNotificationEventId& /* _return */) { return; } - void fire_notification_event(const FireEventRequest& /* rqst */) { + void fire_listener_event(FireEventResponse& /* _return */, const FireEventRequest& /* rqst */) { return; } }; @@ -16781,38 +16781,38 @@ class ThriftHiveMetastore_get_current_no }; -typedef struct _ThriftHiveMetastore_fire_notification_event_args__isset { - _ThriftHiveMetastore_fire_notification_event_args__isset() : rqst(false) {} +typedef struct _ThriftHiveMetastore_fire_listener_event_args__isset { + _ThriftHiveMetastore_fire_listener_event_args__isset() : rqst(false) {} bool rqst; -} _ThriftHiveMetastore_fire_notification_event_args__isset; +} _ThriftHiveMetastore_fire_listener_event_args__isset; -class ThriftHiveMetastore_fire_notification_event_args { +class ThriftHiveMetastore_fire_listener_event_args { public: - ThriftHiveMetastore_fire_notification_event_args() { + ThriftHiveMetastore_fire_listener_event_args() { } - virtual ~ThriftHiveMetastore_fire_notification_event_args() throw() {} + virtual ~ThriftHiveMetastore_fire_listener_event_args() throw() {} FireEventRequest rqst; - _ThriftHiveMetastore_fire_notification_event_args__isset __isset; + _ThriftHiveMetastore_fire_listener_event_args__isset __isset; void __set_rqst(const FireEventRequest& val) { rqst = val; } - bool operator == (const ThriftHiveMetastore_fire_notification_event_args & rhs) const + bool operator == (const ThriftHiveMetastore_fire_listener_event_args & rhs) const { if (!(rqst == rhs.rqst)) return false; return true; } - bool operator != (const ThriftHiveMetastore_fire_notification_event_args &rhs) const { + bool operator != (const ThriftHiveMetastore_fire_listener_event_args &rhs) const { return !(*this == rhs); } - bool operator < (const ThriftHiveMetastore_fire_notification_event_args & ) const; + bool operator < (const ThriftHiveMetastore_fire_listener_event_args & ) const; uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; @@ -16820,11 +16820,11 @@ class ThriftHiveMetastore_fire_notificat }; -class ThriftHiveMetastore_fire_notification_event_pargs { +class ThriftHiveMetastore_fire_listener_event_pargs { public: - virtual ~ThriftHiveMetastore_fire_notification_event_pargs() throw() {} + virtual ~ThriftHiveMetastore_fire_listener_event_pargs() throw() {} const FireEventRequest* rqst; @@ -16832,38 +16832,58 @@ class ThriftHiveMetastore_fire_notificat }; +typedef struct _ThriftHiveMetastore_fire_listener_event_result__isset { + _ThriftHiveMetastore_fire_listener_event_result__isset() : success(false) {} + bool success; +} _ThriftHiveMetastore_fire_listener_event_result__isset; -class ThriftHiveMetastore_fire_notification_event_result { +class ThriftHiveMetastore_fire_listener_event_result { public: - ThriftHiveMetastore_fire_notification_event_result() { + ThriftHiveMetastore_fire_listener_event_result() { } - virtual ~ThriftHiveMetastore_fire_notification_event_result() throw() {} + virtual ~ThriftHiveMetastore_fire_listener_event_result() throw() {} + + FireEventResponse success; + + _ThriftHiveMetastore_fire_listener_event_result__isset __isset; + void __set_success(const FireEventResponse& val) { + success = val; + } - bool operator == (const ThriftHiveMetastore_fire_notification_event_result & /* rhs */) const + bool operator == (const ThriftHiveMetastore_fire_listener_event_result & rhs) const { + if (!(success == rhs.success)) + return false; return true; } - bool operator != (const ThriftHiveMetastore_fire_notification_event_result &rhs) const { + bool operator != (const ThriftHiveMetastore_fire_listener_event_result &rhs) const { return !(*this == rhs); } - bool operator < (const ThriftHiveMetastore_fire_notification_event_result & ) const; + bool operator < (const ThriftHiveMetastore_fire_listener_event_result & ) const; uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; }; +typedef struct _ThriftHiveMetastore_fire_listener_event_presult__isset { + _ThriftHiveMetastore_fire_listener_event_presult__isset() : success(false) {} + bool success; +} _ThriftHiveMetastore_fire_listener_event_presult__isset; -class ThriftHiveMetastore_fire_notification_event_presult { +class ThriftHiveMetastore_fire_listener_event_presult { public: - virtual ~ThriftHiveMetastore_fire_notification_event_presult() throw() {} + virtual ~ThriftHiveMetastore_fire_listener_event_presult() throw() {} + FireEventResponse* success; + + _ThriftHiveMetastore_fire_listener_event_presult__isset __isset; uint32_t read(::apache::thrift::protocol::TProtocol* iprot); @@ -17238,9 +17258,9 @@ class ThriftHiveMetastoreClient : virtua void get_current_notificationEventId(CurrentNotificationEventId& _return); void send_get_current_notificationEventId(); void recv_get_current_notificationEventId(CurrentNotificationEventId& _return); - void fire_notification_event(const FireEventRequest& rqst); - void send_fire_notification_event(const FireEventRequest& rqst); - void recv_fire_notification_event(); + void fire_listener_event(FireEventResponse& _return, const FireEventRequest& rqst); + void send_fire_listener_event(const FireEventRequest& rqst); + void recv_fire_listener_event(FireEventResponse& _return); }; class ThriftHiveMetastoreProcessor : public ::facebook::fb303::FacebookServiceProcessor { @@ -17370,7 +17390,7 @@ class ThriftHiveMetastoreProcessor : pub void process_show_compact(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext); void process_get_next_notification(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext); void process_get_current_notificationEventId(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext); - void process_fire_notification_event(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext); + void process_fire_listener_event(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext); public: ThriftHiveMetastoreProcessor(boost::shared_ptr<ThriftHiveMetastoreIf> iface) : ::facebook::fb303::FacebookServiceProcessor(iface), @@ -17494,7 +17514,7 @@ class ThriftHiveMetastoreProcessor : pub processMap_["show_compact"] = &ThriftHiveMetastoreProcessor::process_show_compact; processMap_["get_next_notification"] = &ThriftHiveMetastoreProcessor::process_get_next_notification; processMap_["get_current_notificationEventId"] = &ThriftHiveMetastoreProcessor::process_get_current_notificationEventId; - processMap_["fire_notification_event"] = &ThriftHiveMetastoreProcessor::process_fire_notification_event; + processMap_["fire_listener_event"] = &ThriftHiveMetastoreProcessor::process_fire_listener_event; } virtual ~ThriftHiveMetastoreProcessor() {} @@ -18669,13 +18689,14 @@ class ThriftHiveMetastoreMultiface : vir return; } - void fire_notification_event(const FireEventRequest& rqst) { + void fire_listener_event(FireEventResponse& _return, const FireEventRequest& rqst) { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->fire_notification_event(rqst); + ifaces_[i]->fire_listener_event(_return, rqst); } - ifaces_[i]->fire_notification_event(rqst); + ifaces_[i]->fire_listener_event(_return, rqst); + return; } };
Modified: hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore_server.skeleton.cpp URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore_server.skeleton.cpp?rev=1657387&r1=1657386&r2=1657387&view=diff ============================================================================== --- hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore_server.skeleton.cpp (original) +++ hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore_server.skeleton.cpp Wed Feb 4 19:24:12 2015 @@ -617,9 +617,9 @@ class ThriftHiveMetastoreHandler : virtu printf("get_current_notificationEventId\n"); } - void fire_notification_event(const FireEventRequest& rqst) { + void fire_listener_event(FireEventResponse& _return, const FireEventRequest& rqst) { // Your implementation goes here - printf("fire_notification_event\n"); + printf("fire_listener_event\n"); } }; Modified: hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp?rev=1657387&r1=1657386&r2=1657387&view=diff ============================================================================== --- hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp (original) +++ hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp Wed Feb 4 19:24:12 2015 @@ -9662,8 +9662,154 @@ void swap(CurrentNotificationEventId &a, swap(a.eventId, b.eventId); } -const char* FireEventRequest::ascii_fingerprint = "252423A2C6348E0FFCA35061FD783C8F"; -const uint8_t FireEventRequest::binary_fingerprint[16] = {0x25,0x24,0x23,0xA2,0xC6,0x34,0x8E,0x0F,0xFC,0xA3,0x50,0x61,0xFD,0x78,0x3C,0x8F}; +const char* InsertEventRequestData::ascii_fingerprint = "ACE4F644F0FDD289DDC4EE5B83BC13C0"; +const uint8_t InsertEventRequestData::binary_fingerprint[16] = {0xAC,0xE4,0xF6,0x44,0xF0,0xFD,0xD2,0x89,0xDD,0xC4,0xEE,0x5B,0x83,0xBC,0x13,0xC0}; + +uint32_t InsertEventRequestData::read(::apache::thrift::protocol::TProtocol* iprot) { + + uint32_t xfer = 0; + std::string fname; + ::apache::thrift::protocol::TType ftype; + int16_t fid; + + xfer += iprot->readStructBegin(fname); + + using ::apache::thrift::protocol::TProtocolException; + + bool isset_filesAdded = false; + + while (true) + { + xfer += iprot->readFieldBegin(fname, ftype, fid); + if (ftype == ::apache::thrift::protocol::T_STOP) { + break; + } + switch (fid) + { + case 1: + if (ftype == ::apache::thrift::protocol::T_LIST) { + { + this->filesAdded.clear(); + uint32_t _size407; + ::apache::thrift::protocol::TType _etype410; + xfer += iprot->readListBegin(_etype410, _size407); + this->filesAdded.resize(_size407); + uint32_t _i411; + for (_i411 = 0; _i411 < _size407; ++_i411) + { + xfer += iprot->readString(this->filesAdded[_i411]); + } + xfer += iprot->readListEnd(); + } + isset_filesAdded = true; + } else { + xfer += iprot->skip(ftype); + } + break; + default: + xfer += iprot->skip(ftype); + break; + } + xfer += iprot->readFieldEnd(); + } + + xfer += iprot->readStructEnd(); + + if (!isset_filesAdded) + throw TProtocolException(TProtocolException::INVALID_DATA); + return xfer; +} + +uint32_t InsertEventRequestData::write(::apache::thrift::protocol::TProtocol* oprot) const { + uint32_t xfer = 0; + xfer += oprot->writeStructBegin("InsertEventRequestData"); + + xfer += oprot->writeFieldBegin("filesAdded", ::apache::thrift::protocol::T_LIST, 1); + { + xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->filesAdded.size())); + std::vector<std::string> ::const_iterator _iter412; + for (_iter412 = this->filesAdded.begin(); _iter412 != this->filesAdded.end(); ++_iter412) + { + xfer += oprot->writeString((*_iter412)); + } + xfer += oprot->writeListEnd(); + } + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldStop(); + xfer += oprot->writeStructEnd(); + return xfer; +} + +void swap(InsertEventRequestData &a, InsertEventRequestData &b) { + using ::std::swap; + swap(a.filesAdded, b.filesAdded); +} + +const char* FireEventRequestData::ascii_fingerprint = "187E754B26707EE32451E6A27FB672CE"; +const uint8_t FireEventRequestData::binary_fingerprint[16] = {0x18,0x7E,0x75,0x4B,0x26,0x70,0x7E,0xE3,0x24,0x51,0xE6,0xA2,0x7F,0xB6,0x72,0xCE}; + +uint32_t FireEventRequestData::read(::apache::thrift::protocol::TProtocol* iprot) { + + uint32_t xfer = 0; + std::string fname; + ::apache::thrift::protocol::TType ftype; + int16_t fid; + + xfer += iprot->readStructBegin(fname); + + using ::apache::thrift::protocol::TProtocolException; + + + while (true) + { + xfer += iprot->readFieldBegin(fname, ftype, fid); + if (ftype == ::apache::thrift::protocol::T_STOP) { + break; + } + switch (fid) + { + case 1: + if (ftype == ::apache::thrift::protocol::T_STRUCT) { + xfer += this->insertData.read(iprot); + this->__isset.insertData = true; + } else { + xfer += iprot->skip(ftype); + } + break; + default: + xfer += iprot->skip(ftype); + break; + } + xfer += iprot->readFieldEnd(); + } + + xfer += iprot->readStructEnd(); + + return xfer; +} + +uint32_t FireEventRequestData::write(::apache::thrift::protocol::TProtocol* oprot) const { + uint32_t xfer = 0; + xfer += oprot->writeStructBegin("FireEventRequestData"); + + xfer += oprot->writeFieldBegin("insertData", ::apache::thrift::protocol::T_STRUCT, 1); + xfer += this->insertData.write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldStop(); + xfer += oprot->writeStructEnd(); + return xfer; +} + +void swap(FireEventRequestData &a, FireEventRequestData &b) { + using ::std::swap; + swap(a.insertData, b.insertData); + swap(a.__isset, b.__isset); +} + +const char* FireEventRequest::ascii_fingerprint = "1BA3A7F00159254072C3979B1429B50B"; +const uint8_t FireEventRequest::binary_fingerprint[16] = {0x1B,0xA3,0xA7,0xF0,0x01,0x59,0x25,0x40,0x72,0xC3,0x97,0x9B,0x14,0x29,0xB5,0x0B}; uint32_t FireEventRequest::read(::apache::thrift::protocol::TProtocol* iprot) { @@ -9676,9 +9822,8 @@ uint32_t FireEventRequest::read(::apache using ::apache::thrift::protocol::TProtocolException; - bool isset_eventType = false; - bool isset_dbName = false; bool isset_successful = false; + bool isset_data = false; while (true) { @@ -9689,27 +9834,25 @@ uint32_t FireEventRequest::read(::apache switch (fid) { case 1: - if (ftype == ::apache::thrift::protocol::T_I32) { - int32_t ecast407; - xfer += iprot->readI32(ecast407); - this->eventType = (EventRequestType::type)ecast407; - isset_eventType = true; + if (ftype == ::apache::thrift::protocol::T_BOOL) { + xfer += iprot->readBool(this->successful); + isset_successful = true; } else { xfer += iprot->skip(ftype); } break; case 2: - if (ftype == ::apache::thrift::protocol::T_STRING) { - xfer += iprot->readString(this->dbName); - isset_dbName = true; + if (ftype == ::apache::thrift::protocol::T_STRUCT) { + xfer += this->data.read(iprot); + isset_data = true; } else { xfer += iprot->skip(ftype); } break; case 3: - if (ftype == ::apache::thrift::protocol::T_BOOL) { - xfer += iprot->readBool(this->successful); - isset_successful = true; + if (ftype == ::apache::thrift::protocol::T_STRING) { + xfer += iprot->readString(this->dbName); + this->__isset.dbName = true; } else { xfer += iprot->skip(ftype); } @@ -9726,14 +9869,14 @@ uint32_t FireEventRequest::read(::apache if (ftype == ::apache::thrift::protocol::T_LIST) { { this->partitionVals.clear(); - uint32_t _size408; - ::apache::thrift::protocol::TType _etype411; - xfer += iprot->readListBegin(_etype411, _size408); - this->partitionVals.resize(_size408); - uint32_t _i412; - for (_i412 = 0; _i412 < _size408; ++_i412) + uint32_t _size413; + ::apache::thrift::protocol::TType _etype416; + xfer += iprot->readListBegin(_etype416, _size413); + this->partitionVals.resize(_size413); + uint32_t _i417; + for (_i417 = 0; _i417 < _size413; ++_i417) { - xfer += iprot->readString(this->partitionVals[_i412]); + xfer += iprot->readString(this->partitionVals[_i417]); } xfer += iprot->readListEnd(); } @@ -9751,12 +9894,10 @@ uint32_t FireEventRequest::read(::apache xfer += iprot->readStructEnd(); - if (!isset_eventType) - throw TProtocolException(TProtocolException::INVALID_DATA); - if (!isset_dbName) - throw TProtocolException(TProtocolException::INVALID_DATA); if (!isset_successful) throw TProtocolException(TProtocolException::INVALID_DATA); + if (!isset_data) + throw TProtocolException(TProtocolException::INVALID_DATA); return xfer; } @@ -9764,18 +9905,19 @@ uint32_t FireEventRequest::write(::apach uint32_t xfer = 0; xfer += oprot->writeStructBegin("FireEventRequest"); - xfer += oprot->writeFieldBegin("eventType", ::apache::thrift::protocol::T_I32, 1); - xfer += oprot->writeI32((int32_t)this->eventType); + xfer += oprot->writeFieldBegin("successful", ::apache::thrift::protocol::T_BOOL, 1); + xfer += oprot->writeBool(this->successful); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("dbName", ::apache::thrift::protocol::T_STRING, 2); - xfer += oprot->writeString(this->dbName); - xfer += oprot->writeFieldEnd(); - - xfer += oprot->writeFieldBegin("successful", ::apache::thrift::protocol::T_BOOL, 3); - xfer += oprot->writeBool(this->successful); + xfer += oprot->writeFieldBegin("data", ::apache::thrift::protocol::T_STRUCT, 2); + xfer += this->data.write(oprot); xfer += oprot->writeFieldEnd(); + if (this->__isset.dbName) { + xfer += oprot->writeFieldBegin("dbName", ::apache::thrift::protocol::T_STRING, 3); + xfer += oprot->writeString(this->dbName); + xfer += oprot->writeFieldEnd(); + } if (this->__isset.tableName) { xfer += oprot->writeFieldBegin("tableName", ::apache::thrift::protocol::T_STRING, 4); xfer += oprot->writeString(this->tableName); @@ -9785,10 +9927,10 @@ uint32_t FireEventRequest::write(::apach xfer += oprot->writeFieldBegin("partitionVals", ::apache::thrift::protocol::T_LIST, 5); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->partitionVals.size())); - std::vector<std::string> ::const_iterator _iter413; - for (_iter413 = this->partitionVals.begin(); _iter413 != this->partitionVals.end(); ++_iter413) + std::vector<std::string> ::const_iterator _iter418; + for (_iter418 = this->partitionVals.begin(); _iter418 != this->partitionVals.end(); ++_iter418) { - xfer += oprot->writeString((*_iter413)); + xfer += oprot->writeString((*_iter418)); } xfer += oprot->writeListEnd(); } @@ -9801,14 +9943,59 @@ uint32_t FireEventRequest::write(::apach void swap(FireEventRequest &a, FireEventRequest &b) { using ::std::swap; - swap(a.eventType, b.eventType); - swap(a.dbName, b.dbName); swap(a.successful, b.successful); + swap(a.data, b.data); + swap(a.dbName, b.dbName); swap(a.tableName, b.tableName); swap(a.partitionVals, b.partitionVals); swap(a.__isset, b.__isset); } +const char* FireEventResponse::ascii_fingerprint = "99914B932BD37A50B983C5E7C90AE93B"; +const uint8_t FireEventResponse::binary_fingerprint[16] = {0x99,0x91,0x4B,0x93,0x2B,0xD3,0x7A,0x50,0xB9,0x83,0xC5,0xE7,0xC9,0x0A,0xE9,0x3B}; + +uint32_t FireEventResponse::read(::apache::thrift::protocol::TProtocol* iprot) { + + uint32_t xfer = 0; + std::string fname; + ::apache::thrift::protocol::TType ftype; + int16_t fid; + + xfer += iprot->readStructBegin(fname); + + using ::apache::thrift::protocol::TProtocolException; + + + while (true) + { + xfer += iprot->readFieldBegin(fname, ftype, fid); + if (ftype == ::apache::thrift::protocol::T_STOP) { + break; + } + xfer += iprot->skip(ftype); + xfer += iprot->readFieldEnd(); + } + + xfer += iprot->readStructEnd(); + + return xfer; +} + +uint32_t FireEventResponse::write(::apache::thrift::protocol::TProtocol* oprot) const { + uint32_t xfer = 0; + xfer += oprot->writeStructBegin("FireEventResponse"); + + xfer += oprot->writeFieldStop(); + xfer += oprot->writeStructEnd(); + return xfer; +} + +void swap(FireEventResponse &a, FireEventResponse &b) { + using ::std::swap; + (void) a; + (void) b; +} + const char* MetaException::ascii_fingerprint = "EFB929595D312AC8F305D5A794CFEDA1"; const uint8_t MetaException::binary_fingerprint[16] = {0xEF,0xB9,0x29,0x59,0x5D,0x31,0x2A,0xC8,0xF3,0x05,0xD5,0xA7,0x94,0xCF,0xED,0xA1}; Modified: hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h?rev=1657387&r1=1657386&r2=1657387&view=diff ============================================================================== --- hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h (original) +++ hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h Wed Feb 4 19:24:12 2015 @@ -5300,8 +5300,89 @@ class CurrentNotificationEventId { void swap(CurrentNotificationEventId &a, CurrentNotificationEventId &b); + +class InsertEventRequestData { + public: + + static const char* ascii_fingerprint; // = "ACE4F644F0FDD289DDC4EE5B83BC13C0"; + static const uint8_t binary_fingerprint[16]; // = {0xAC,0xE4,0xF6,0x44,0xF0,0xFD,0xD2,0x89,0xDD,0xC4,0xEE,0x5B,0x83,0xBC,0x13,0xC0}; + + InsertEventRequestData() { + } + + virtual ~InsertEventRequestData() throw() {} + + std::vector<std::string> filesAdded; + + void __set_filesAdded(const std::vector<std::string> & val) { + filesAdded = val; + } + + bool operator == (const InsertEventRequestData & rhs) const + { + if (!(filesAdded == rhs.filesAdded)) + return false; + return true; + } + bool operator != (const InsertEventRequestData &rhs) const { + return !(*this == rhs); + } + + bool operator < (const InsertEventRequestData & ) const; + + uint32_t read(::apache::thrift::protocol::TProtocol* iprot); + uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; + +}; + +void swap(InsertEventRequestData &a, InsertEventRequestData &b); + +typedef struct _FireEventRequestData__isset { + _FireEventRequestData__isset() : insertData(false) {} + bool insertData; +} _FireEventRequestData__isset; + +class FireEventRequestData { + public: + + static const char* ascii_fingerprint; // = "187E754B26707EE32451E6A27FB672CE"; + static const uint8_t binary_fingerprint[16]; // = {0x18,0x7E,0x75,0x4B,0x26,0x70,0x7E,0xE3,0x24,0x51,0xE6,0xA2,0x7F,0xB6,0x72,0xCE}; + + FireEventRequestData() { + } + + virtual ~FireEventRequestData() throw() {} + + InsertEventRequestData insertData; + + _FireEventRequestData__isset __isset; + + void __set_insertData(const InsertEventRequestData& val) { + insertData = val; + } + + bool operator == (const FireEventRequestData & rhs) const + { + if (!(insertData == rhs.insertData)) + return false; + return true; + } + bool operator != (const FireEventRequestData &rhs) const { + return !(*this == rhs); + } + + bool operator < (const FireEventRequestData & ) const; + + uint32_t read(::apache::thrift::protocol::TProtocol* iprot); + uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; + +}; + +void swap(FireEventRequestData &a, FireEventRequestData &b); + typedef struct _FireEventRequest__isset { - _FireEventRequest__isset() : tableName(false), partitionVals(false) {} + _FireEventRequest__isset() : dbName(false), tableName(false), partitionVals(false) {} + bool dbName; bool tableName; bool partitionVals; } _FireEventRequest__isset; @@ -5309,32 +5390,33 @@ typedef struct _FireEventRequest__isset class FireEventRequest { public: - static const char* ascii_fingerprint; // = "252423A2C6348E0FFCA35061FD783C8F"; - static const uint8_t binary_fingerprint[16]; // = {0x25,0x24,0x23,0xA2,0xC6,0x34,0x8E,0x0F,0xFC,0xA3,0x50,0x61,0xFD,0x78,0x3C,0x8F}; + static const char* ascii_fingerprint; // = "1BA3A7F00159254072C3979B1429B50B"; + static const uint8_t binary_fingerprint[16]; // = {0x1B,0xA3,0xA7,0xF0,0x01,0x59,0x25,0x40,0x72,0xC3,0x97,0x9B,0x14,0x29,0xB5,0x0B}; - FireEventRequest() : eventType((EventRequestType::type)0), dbName(), successful(0), tableName() { + FireEventRequest() : successful(0), dbName(), tableName() { } virtual ~FireEventRequest() throw() {} - EventRequestType::type eventType; - std::string dbName; bool successful; + FireEventRequestData data; + std::string dbName; std::string tableName; std::vector<std::string> partitionVals; _FireEventRequest__isset __isset; - void __set_eventType(const EventRequestType::type val) { - eventType = val; + void __set_successful(const bool val) { + successful = val; } - void __set_dbName(const std::string& val) { - dbName = val; + void __set_data(const FireEventRequestData& val) { + data = val; } - void __set_successful(const bool val) { - successful = val; + void __set_dbName(const std::string& val) { + dbName = val; + __isset.dbName = true; } void __set_tableName(const std::string& val) { @@ -5349,11 +5431,13 @@ class FireEventRequest { bool operator == (const FireEventRequest & rhs) const { - if (!(eventType == rhs.eventType)) + if (!(successful == rhs.successful)) return false; - if (!(dbName == rhs.dbName)) + if (!(data == rhs.data)) return false; - if (!(successful == rhs.successful)) + 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; @@ -5378,6 +5462,36 @@ class FireEventRequest { void swap(FireEventRequest &a, FireEventRequest &b); + +class FireEventResponse { + public: + + static const char* ascii_fingerprint; // = "99914B932BD37A50B983C5E7C90AE93B"; + static const uint8_t binary_fingerprint[16]; // = {0x99,0x91,0x4B,0x93,0x2B,0xD3,0x7A,0x50,0xB9,0x83,0xC5,0xE7,0xC9,0x0A,0xE9,0x3B}; + + FireEventResponse() { + } + + virtual ~FireEventResponse() throw() {} + + + bool operator == (const FireEventResponse & /* rhs */) const + { + return true; + } + bool operator != (const FireEventResponse &rhs) const { + return !(*this == rhs); + } + + bool operator < (const FireEventResponse & ) const; + + uint32_t read(::apache::thrift::protocol::TProtocol* iprot); + uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; + +}; + +void swap(FireEventResponse &a, FireEventResponse &b); + typedef struct _MetaException__isset { _MetaException__isset() : message(false) {} bool message; Modified: hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequest.java URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequest.java?rev=1657387&r1=1657386&r2=1657387&view=diff ============================================================================== --- hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequest.java (original) +++ hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequest.java Wed Feb 4 19:24:12 2015 @@ -34,9 +34,9 @@ import org.slf4j.LoggerFactory; public class FireEventRequest implements org.apache.thrift.TBase<FireEventRequest, FireEventRequest._Fields>, java.io.Serializable, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FireEventRequest"); - private static final org.apache.thrift.protocol.TField EVENT_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("eventType", org.apache.thrift.protocol.TType.I32, (short)1); - private static final org.apache.thrift.protocol.TField DB_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("dbName", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField SUCCESSFUL_FIELD_DESC = new org.apache.thrift.protocol.TField("successful", org.apache.thrift.protocol.TType.BOOL, (short)3); + private static final org.apache.thrift.protocol.TField SUCCESSFUL_FIELD_DESC = new org.apache.thrift.protocol.TField("successful", org.apache.thrift.protocol.TType.BOOL, (short)1); + private static final org.apache.thrift.protocol.TField DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("data", org.apache.thrift.protocol.TType.STRUCT, (short)2); + private static final org.apache.thrift.protocol.TField DB_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("dbName", org.apache.thrift.protocol.TType.STRING, (short)3); private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)4); private static final org.apache.thrift.protocol.TField PARTITION_VALS_FIELD_DESC = new org.apache.thrift.protocol.TField("partitionVals", org.apache.thrift.protocol.TType.LIST, (short)5); @@ -46,21 +46,17 @@ public class FireEventRequest implements schemes.put(TupleScheme.class, new FireEventRequestTupleSchemeFactory()); } - private EventRequestType eventType; // required - private String dbName; // required private boolean successful; // required + private FireEventRequestData data; // required + private String dbName; // optional private String tableName; // optional private List<String> partitionVals; // 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 { - /** - * - * @see EventRequestType - */ - EVENT_TYPE((short)1, "eventType"), - DB_NAME((short)2, "dbName"), - SUCCESSFUL((short)3, "successful"), + SUCCESSFUL((short)1, "successful"), + DATA((short)2, "data"), + DB_NAME((short)3, "dbName"), TABLE_NAME((short)4, "tableName"), PARTITION_VALS((short)5, "partitionVals"); @@ -77,12 +73,12 @@ public class FireEventRequest implements */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // EVENT_TYPE - return EVENT_TYPE; - case 2: // DB_NAME - return DB_NAME; - case 3: // SUCCESSFUL + case 1: // SUCCESSFUL return SUCCESSFUL; + case 2: // DATA + return DATA; + case 3: // DB_NAME + return DB_NAME; case 4: // TABLE_NAME return TABLE_NAME; case 5: // PARTITION_VALS @@ -129,16 +125,16 @@ public class FireEventRequest implements // isset id assignments private static final int __SUCCESSFUL_ISSET_ID = 0; private byte __isset_bitfield = 0; - private _Fields optionals[] = {_Fields.TABLE_NAME,_Fields.PARTITION_VALS}; + private _Fields optionals[] = {_Fields.DB_NAME,_Fields.TABLE_NAME,_Fields.PARTITION_VALS}; 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.EVENT_TYPE, new org.apache.thrift.meta_data.FieldMetaData("eventType", org.apache.thrift.TFieldRequirementType.REQUIRED, - new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, EventRequestType.class))); - tmpMap.put(_Fields.DB_NAME, new org.apache.thrift.meta_data.FieldMetaData("dbName", org.apache.thrift.TFieldRequirementType.REQUIRED, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.SUCCESSFUL, new org.apache.thrift.meta_data.FieldMetaData("successful", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); + tmpMap.put(_Fields.DATA, new org.apache.thrift.meta_data.FieldMetaData("data", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, FireEventRequestData.class))); + tmpMap.put(_Fields.DB_NAME, 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.TABLE_NAME, 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.PARTITION_VALS, new org.apache.thrift.meta_data.FieldMetaData("partitionVals", org.apache.thrift.TFieldRequirementType.OPTIONAL, @@ -152,15 +148,13 @@ public class FireEventRequest implements } public FireEventRequest( - EventRequestType eventType, - String dbName, - boolean successful) + boolean successful, + FireEventRequestData data) { this(); - this.eventType = eventType; - this.dbName = dbName; this.successful = successful; setSuccessfulIsSet(true); + this.data = data; } /** @@ -168,13 +162,13 @@ public class FireEventRequest implements */ public FireEventRequest(FireEventRequest other) { __isset_bitfield = other.__isset_bitfield; - if (other.isSetEventType()) { - this.eventType = other.eventType; + this.successful = other.successful; + if (other.isSetData()) { + this.data = new FireEventRequestData(other.data); } if (other.isSetDbName()) { this.dbName = other.dbName; } - this.successful = other.successful; if (other.isSetTableName()) { this.tableName = other.tableName; } @@ -193,42 +187,56 @@ public class FireEventRequest implements @Override public void clear() { - this.eventType = null; - this.dbName = null; setSuccessfulIsSet(false); this.successful = false; + this.data = null; + this.dbName = null; this.tableName = null; this.partitionVals = null; } - /** - * - * @see EventRequestType - */ - public EventRequestType getEventType() { - return this.eventType; + public boolean isSuccessful() { + return this.successful; } - /** - * - * @see EventRequestType - */ - public void setEventType(EventRequestType eventType) { - this.eventType = eventType; + public void setSuccessful(boolean successful) { + this.successful = successful; + setSuccessfulIsSet(true); + } + + public void unsetSuccessful() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESSFUL_ISSET_ID); + } + + /** Returns true if field successful is set (has been assigned a value) and false otherwise */ + public boolean isSetSuccessful() { + return EncodingUtils.testBit(__isset_bitfield, __SUCCESSFUL_ISSET_ID); + } + + public void setSuccessfulIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESSFUL_ISSET_ID, value); } - public void unsetEventType() { - this.eventType = null; + public FireEventRequestData getData() { + return this.data; } - /** Returns true if field eventType is set (has been assigned a value) and false otherwise */ - public boolean isSetEventType() { - return this.eventType != null; + public void setData(FireEventRequestData data) { + this.data = data; } - public void setEventTypeIsSet(boolean value) { + public void unsetData() { + this.data = null; + } + + /** Returns true if field data is set (has been assigned a value) and false otherwise */ + public boolean isSetData() { + return this.data != null; + } + + public void setDataIsSet(boolean value) { if (!value) { - this.eventType = null; + this.data = null; } } @@ -255,28 +263,6 @@ public class FireEventRequest implements } } - public boolean isSuccessful() { - return this.successful; - } - - public void setSuccessful(boolean successful) { - this.successful = successful; - setSuccessfulIsSet(true); - } - - public void unsetSuccessful() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESSFUL_ISSET_ID); - } - - /** Returns true if field successful is set (has been assigned a value) and false otherwise */ - public boolean isSetSuccessful() { - return EncodingUtils.testBit(__isset_bitfield, __SUCCESSFUL_ISSET_ID); - } - - public void setSuccessfulIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESSFUL_ISSET_ID, value); - } - public String getTableName() { return this.tableName; } @@ -340,27 +326,27 @@ public class FireEventRequest implements public void setFieldValue(_Fields field, Object value) { switch (field) { - case EVENT_TYPE: + case SUCCESSFUL: if (value == null) { - unsetEventType(); + unsetSuccessful(); } else { - setEventType((EventRequestType)value); + setSuccessful((Boolean)value); } break; - case DB_NAME: + case DATA: if (value == null) { - unsetDbName(); + unsetData(); } else { - setDbName((String)value); + setData((FireEventRequestData)value); } break; - case SUCCESSFUL: + case DB_NAME: if (value == null) { - unsetSuccessful(); + unsetDbName(); } else { - setSuccessful((Boolean)value); + setDbName((String)value); } break; @@ -385,15 +371,15 @@ public class FireEventRequest implements public Object getFieldValue(_Fields field) { switch (field) { - case EVENT_TYPE: - return getEventType(); + case SUCCESSFUL: + return Boolean.valueOf(isSuccessful()); + + case DATA: + return getData(); case DB_NAME: return getDbName(); - case SUCCESSFUL: - return Boolean.valueOf(isSuccessful()); - case TABLE_NAME: return getTableName(); @@ -411,12 +397,12 @@ public class FireEventRequest implements } switch (field) { - case EVENT_TYPE: - return isSetEventType(); - case DB_NAME: - return isSetDbName(); case SUCCESSFUL: return isSetSuccessful(); + case DATA: + return isSetData(); + case DB_NAME: + return isSetDbName(); case TABLE_NAME: return isSetTableName(); case PARTITION_VALS: @@ -438,12 +424,21 @@ public class FireEventRequest implements if (that == null) return false; - boolean this_present_eventType = true && this.isSetEventType(); - boolean that_present_eventType = true && that.isSetEventType(); - if (this_present_eventType || that_present_eventType) { - if (!(this_present_eventType && that_present_eventType)) + boolean this_present_successful = true; + boolean that_present_successful = true; + if (this_present_successful || that_present_successful) { + if (!(this_present_successful && that_present_successful)) return false; - if (!this.eventType.equals(that.eventType)) + if (this.successful != that.successful) + return false; + } + + boolean this_present_data = true && this.isSetData(); + boolean that_present_data = true && that.isSetData(); + if (this_present_data || that_present_data) { + if (!(this_present_data && that_present_data)) + return false; + if (!this.data.equals(that.data)) return false; } @@ -456,15 +451,6 @@ public class FireEventRequest implements return false; } - boolean this_present_successful = true; - boolean that_present_successful = true; - if (this_present_successful || that_present_successful) { - if (!(this_present_successful && that_present_successful)) - return false; - if (this.successful != that.successful) - return false; - } - boolean this_present_tableName = true && this.isSetTableName(); boolean that_present_tableName = true && that.isSetTableName(); if (this_present_tableName || that_present_tableName) { @@ -490,21 +476,21 @@ public class FireEventRequest implements public int hashCode() { HashCodeBuilder builder = new HashCodeBuilder(); - boolean present_eventType = true && (isSetEventType()); - builder.append(present_eventType); - if (present_eventType) - builder.append(eventType.getValue()); + boolean present_successful = true; + builder.append(present_successful); + if (present_successful) + builder.append(successful); + + boolean present_data = true && (isSetData()); + builder.append(present_data); + if (present_data) + builder.append(data); boolean present_dbName = true && (isSetDbName()); builder.append(present_dbName); if (present_dbName) builder.append(dbName); - boolean present_successful = true; - builder.append(present_successful); - if (present_successful) - builder.append(successful); - boolean present_tableName = true && (isSetTableName()); builder.append(present_tableName); if (present_tableName) @@ -526,32 +512,32 @@ public class FireEventRequest implements int lastComparison = 0; FireEventRequest typedOther = (FireEventRequest)other; - lastComparison = Boolean.valueOf(isSetEventType()).compareTo(typedOther.isSetEventType()); + lastComparison = Boolean.valueOf(isSetSuccessful()).compareTo(typedOther.isSetSuccessful()); if (lastComparison != 0) { return lastComparison; } - if (isSetEventType()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.eventType, typedOther.eventType); + if (isSetSuccessful()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.successful, typedOther.successful); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetDbName()).compareTo(typedOther.isSetDbName()); + lastComparison = Boolean.valueOf(isSetData()).compareTo(typedOther.isSetData()); if (lastComparison != 0) { return lastComparison; } - if (isSetDbName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dbName, typedOther.dbName); + if (isSetData()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.data, typedOther.data); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetSuccessful()).compareTo(typedOther.isSetSuccessful()); + lastComparison = Boolean.valueOf(isSetDbName()).compareTo(typedOther.isSetDbName()); if (lastComparison != 0) { return lastComparison; } - if (isSetSuccessful()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.successful, typedOther.successful); + if (isSetDbName()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dbName, typedOther.dbName); if (lastComparison != 0) { return lastComparison; } @@ -596,25 +582,27 @@ public class FireEventRequest implements StringBuilder sb = new StringBuilder("FireEventRequest("); boolean first = true; - sb.append("eventType:"); - if (this.eventType == null) { - sb.append("null"); - } else { - sb.append(this.eventType); - } + sb.append("successful:"); + sb.append(this.successful); first = false; if (!first) sb.append(", "); - sb.append("dbName:"); - if (this.dbName == null) { + sb.append("data:"); + if (this.data == null) { sb.append("null"); } else { - sb.append(this.dbName); + sb.append(this.data); } first = false; - if (!first) sb.append(", "); - sb.append("successful:"); - sb.append(this.successful); - first = false; + if (isSetDbName()) { + if (!first) sb.append(", "); + 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:"); @@ -641,18 +629,14 @@ public class FireEventRequest implements public void validate() throws org.apache.thrift.TException { // check for required fields - if (!isSetEventType()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'eventType' is unset! Struct:" + toString()); - } - - if (!isSetDbName()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'dbName' is unset! Struct:" + toString()); - } - if (!isSetSuccessful()) { throw new org.apache.thrift.protocol.TProtocolException("Required field 'successful' is unset! Struct:" + toString()); } + if (!isSetData()) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'data' is unset! Struct:" + toString()); + } + // check for sub-struct validity } @@ -692,26 +676,27 @@ public class FireEventRequest implements break; } switch (schemeField.id) { - case 1: // EVENT_TYPE - if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.eventType = EventRequestType.findByValue(iprot.readI32()); - struct.setEventTypeIsSet(true); + case 1: // SUCCESSFUL + if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { + struct.successful = iprot.readBool(); + struct.setSuccessfulIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 2: // DB_NAME - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.dbName = iprot.readString(); - struct.setDbNameIsSet(true); + case 2: // DATA + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.data = new FireEventRequestData(); + struct.data.read(iprot); + struct.setDataIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // SUCCESSFUL - if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { - struct.successful = iprot.readBool(); - struct.setSuccessfulIsSet(true); + case 3: // DB_NAME + 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); } @@ -727,13 +712,13 @@ public class FireEventRequest implements case 5: // PARTITION_VALS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list500 = iprot.readListBegin(); - struct.partitionVals = new ArrayList<String>(_list500.size); - for (int _i501 = 0; _i501 < _list500.size; ++_i501) + org.apache.thrift.protocol.TList _list508 = iprot.readListBegin(); + struct.partitionVals = new ArrayList<String>(_list508.size); + for (int _i509 = 0; _i509 < _list508.size; ++_i509) { - String _elem502; // required - _elem502 = iprot.readString(); - struct.partitionVals.add(_elem502); + String _elem510; // required + _elem510 = iprot.readString(); + struct.partitionVals.add(_elem510); } iprot.readListEnd(); } @@ -755,19 +740,21 @@ public class FireEventRequest implements struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.eventType != null) { - oprot.writeFieldBegin(EVENT_TYPE_FIELD_DESC); - oprot.writeI32(struct.eventType.getValue()); + oprot.writeFieldBegin(SUCCESSFUL_FIELD_DESC); + oprot.writeBool(struct.successful); + oprot.writeFieldEnd(); + if (struct.data != null) { + oprot.writeFieldBegin(DATA_FIELD_DESC); + struct.data.write(oprot); oprot.writeFieldEnd(); } if (struct.dbName != null) { - oprot.writeFieldBegin(DB_NAME_FIELD_DESC); - oprot.writeString(struct.dbName); - oprot.writeFieldEnd(); + if (struct.isSetDbName()) { + oprot.writeFieldBegin(DB_NAME_FIELD_DESC); + oprot.writeString(struct.dbName); + oprot.writeFieldEnd(); + } } - oprot.writeFieldBegin(SUCCESSFUL_FIELD_DESC); - oprot.writeBool(struct.successful); - oprot.writeFieldEnd(); if (struct.tableName != null) { if (struct.isSetTableName()) { oprot.writeFieldBegin(TABLE_NAME_FIELD_DESC); @@ -780,9 +767,9 @@ public class FireEventRequest implements oprot.writeFieldBegin(PARTITION_VALS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.partitionVals.size())); - for (String _iter503 : struct.partitionVals) + for (String _iter511 : struct.partitionVals) { - oprot.writeString(_iter503); + oprot.writeString(_iter511); } oprot.writeListEnd(); } @@ -806,26 +793,31 @@ public class FireEventRequest implements @Override public void write(org.apache.thrift.protocol.TProtocol prot, FireEventRequest struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; - oprot.writeI32(struct.eventType.getValue()); - oprot.writeString(struct.dbName); oprot.writeBool(struct.successful); + struct.data.write(oprot); BitSet optionals = new BitSet(); - if (struct.isSetTableName()) { + if (struct.isSetDbName()) { optionals.set(0); } - if (struct.isSetPartitionVals()) { + if (struct.isSetTableName()) { optionals.set(1); } - oprot.writeBitSet(optionals, 2); + if (struct.isSetPartitionVals()) { + optionals.set(2); + } + oprot.writeBitSet(optionals, 3); + if (struct.isSetDbName()) { + oprot.writeString(struct.dbName); + } if (struct.isSetTableName()) { oprot.writeString(struct.tableName); } if (struct.isSetPartitionVals()) { { oprot.writeI32(struct.partitionVals.size()); - for (String _iter504 : struct.partitionVals) + for (String _iter512 : struct.partitionVals) { - oprot.writeString(_iter504); + oprot.writeString(_iter512); } } } @@ -834,26 +826,29 @@ public class FireEventRequest implements @Override public void read(org.apache.thrift.protocol.TProtocol prot, FireEventRequest struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - struct.eventType = EventRequestType.findByValue(iprot.readI32()); - struct.setEventTypeIsSet(true); - struct.dbName = iprot.readString(); - struct.setDbNameIsSet(true); struct.successful = iprot.readBool(); struct.setSuccessfulIsSet(true); - BitSet incoming = iprot.readBitSet(2); + struct.data = new FireEventRequestData(); + struct.data.read(iprot); + struct.setDataIsSet(true); + BitSet incoming = iprot.readBitSet(3); 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(1)) { + if (incoming.get(2)) { { - org.apache.thrift.protocol.TList _list505 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.partitionVals = new ArrayList<String>(_list505.size); - for (int _i506 = 0; _i506 < _list505.size; ++_i506) + org.apache.thrift.protocol.TList _list513 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.partitionVals = new ArrayList<String>(_list513.size); + for (int _i514 = 0; _i514 < _list513.size; ++_i514) { - String _elem507; // required - _elem507 = iprot.readString(); - struct.partitionVals.add(_elem507); + String _elem515; // required + _elem515 = iprot.readString(); + struct.partitionVals.add(_elem515); } } struct.setPartitionValsIsSet(true); Added: hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequestData.java URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequestData.java?rev=1657387&view=auto ============================================================================== --- hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequestData.java (added) +++ hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequestData.java Wed Feb 4 19:24:12 2015 @@ -0,0 +1,305 @@ +/** + * Autogenerated by Thrift Compiler (0.9.0) + * + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated + */ +package org.apache.hadoop.hive.metastore.api; + +import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.thrift.scheme.IScheme; +import org.apache.thrift.scheme.SchemeFactory; +import org.apache.thrift.scheme.StandardScheme; + +import org.apache.thrift.scheme.TupleScheme; +import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import java.util.List; +import java.util.ArrayList; +import java.util.Map; +import java.util.HashMap; +import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; +import java.util.EnumSet; +import java.util.Collections; +import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class FireEventRequestData extends org.apache.thrift.TUnion<FireEventRequestData, FireEventRequestData._Fields> { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FireEventRequestData"); + private static final org.apache.thrift.protocol.TField INSERT_DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("insertData", org.apache.thrift.protocol.TType.STRUCT, (short)1); + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + INSERT_DATA((short)1, "insertData"); + + private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case 1: // INSERT_DATA + return INSERT_DATA; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + 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.INSERT_DATA, new org.apache.thrift.meta_data.FieldMetaData("insertData", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, InsertEventRequestData.class))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(FireEventRequestData.class, metaDataMap); + } + + public FireEventRequestData() { + super(); + } + + public FireEventRequestData(_Fields setField, Object value) { + super(setField, value); + } + + public FireEventRequestData(FireEventRequestData other) { + super(other); + } + public FireEventRequestData deepCopy() { + return new FireEventRequestData(this); + } + + public static FireEventRequestData insertData(InsertEventRequestData value) { + FireEventRequestData x = new FireEventRequestData(); + x.setInsertData(value); + return x; + } + + + @Override + protected void checkType(_Fields setField, Object value) throws ClassCastException { + switch (setField) { + case INSERT_DATA: + if (value instanceof InsertEventRequestData) { + break; + } + throw new ClassCastException("Was expecting value of type InsertEventRequestData for field 'insertData', but got " + value.getClass().getSimpleName()); + default: + throw new IllegalArgumentException("Unknown field id " + setField); + } + } + + @Override + protected Object standardSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException { + _Fields setField = _Fields.findByThriftId(field.id); + if (setField != null) { + switch (setField) { + case INSERT_DATA: + if (field.type == INSERT_DATA_FIELD_DESC.type) { + InsertEventRequestData insertData; + insertData = new InsertEventRequestData(); + insertData.read(iprot); + return insertData; + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + return null; + } + default: + throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!"); + } + } else { + return null; + } + } + + @Override + protected void standardSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + switch (setField_) { + case INSERT_DATA: + InsertEventRequestData insertData = (InsertEventRequestData)value_; + insertData.write(oprot); + return; + default: + throw new IllegalStateException("Cannot write union with unknown field " + setField_); + } + } + + @Override + protected Object tupleSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.thrift.TException { + _Fields setField = _Fields.findByThriftId(fieldID); + if (setField != null) { + switch (setField) { + case INSERT_DATA: + InsertEventRequestData insertData; + insertData = new InsertEventRequestData(); + insertData.read(iprot); + return insertData; + default: + throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!"); + } + } else { + throw new TProtocolException("Couldn't find a field with field id " + fieldID); + } + } + + @Override + protected void tupleSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + switch (setField_) { + case INSERT_DATA: + InsertEventRequestData insertData = (InsertEventRequestData)value_; + insertData.write(oprot); + return; + default: + throw new IllegalStateException("Cannot write union with unknown field " + setField_); + } + } + + @Override + protected org.apache.thrift.protocol.TField getFieldDesc(_Fields setField) { + switch (setField) { + case INSERT_DATA: + return INSERT_DATA_FIELD_DESC; + default: + throw new IllegalArgumentException("Unknown field id " + setField); + } + } + + @Override + protected org.apache.thrift.protocol.TStruct getStructDesc() { + return STRUCT_DESC; + } + + @Override + protected _Fields enumForId(short id) { + return _Fields.findByThriftIdOrThrow(id); + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + + public InsertEventRequestData getInsertData() { + if (getSetField() == _Fields.INSERT_DATA) { + return (InsertEventRequestData)getFieldValue(); + } else { + throw new RuntimeException("Cannot get field 'insertData' because union is currently set to " + getFieldDesc(getSetField()).name); + } + } + + public void setInsertData(InsertEventRequestData value) { + if (value == null) throw new NullPointerException(); + setField_ = _Fields.INSERT_DATA; + value_ = value; + } + + public boolean isSetInsertData() { + return setField_ == _Fields.INSERT_DATA; + } + + + public boolean equals(Object other) { + if (other instanceof FireEventRequestData) { + return equals((FireEventRequestData)other); + } else { + return false; + } + } + + public boolean equals(FireEventRequestData other) { + return other != null && getSetField() == other.getSetField() && getFieldValue().equals(other.getFieldValue()); + } + + @Override + public int compareTo(FireEventRequestData other) { + int lastComparison = org.apache.thrift.TBaseHelper.compareTo(getSetField(), other.getSetField()); + if (lastComparison == 0) { + return org.apache.thrift.TBaseHelper.compareTo(getFieldValue(), other.getFieldValue()); + } + return lastComparison; + } + + + @Override + public int hashCode() { + HashCodeBuilder hcb = new HashCodeBuilder(); + hcb.append(this.getClass().getName()); + org.apache.thrift.TFieldIdEnum setField = getSetField(); + if (setField != null) { + hcb.append(setField.getThriftFieldId()); + Object value = getFieldValue(); + if (value instanceof org.apache.thrift.TEnum) { + hcb.append(((org.apache.thrift.TEnum)getFieldValue()).getValue()); + } else { + hcb.append(value); + } + } + return hcb.toHashCode(); + } + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + 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); + } + } + + +} Added: hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventResponse.java URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventResponse.java?rev=1657387&view=auto ============================================================================== --- hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventResponse.java (added) +++ hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventResponse.java Wed Feb 4 19:24:12 2015 @@ -0,0 +1,279 @@ +/** + * Autogenerated by Thrift Compiler (0.9.0) + * + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated + */ +package org.apache.hadoop.hive.metastore.api; + +import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.thrift.scheme.IScheme; +import org.apache.thrift.scheme.SchemeFactory; +import org.apache.thrift.scheme.StandardScheme; + +import org.apache.thrift.scheme.TupleScheme; +import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import java.util.List; +import java.util.ArrayList; +import java.util.Map; +import java.util.HashMap; +import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; +import java.util.EnumSet; +import java.util.Collections; +import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class FireEventResponse implements org.apache.thrift.TBase<FireEventResponse, FireEventResponse._Fields>, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FireEventResponse"); + + + private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new FireEventResponseStandardSchemeFactory()); + schemes.put(TupleScheme.class, new FireEventResponseTupleSchemeFactory()); + } + + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +; + + private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + 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); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(FireEventResponse.class, metaDataMap); + } + + public FireEventResponse() { + } + + /** + * Performs a deep copy on <i>other</i>. + */ + public FireEventResponse(FireEventResponse other) { + } + + public FireEventResponse deepCopy() { + return new FireEventResponse(this); + } + + @Override + public void clear() { + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof FireEventResponse) + return this.equals((FireEventResponse)that); + return false; + } + + public boolean equals(FireEventResponse that) { + if (that == null) + return false; + + return true; + } + + @Override + public int hashCode() { + HashCodeBuilder builder = new HashCodeBuilder(); + + return builder.toHashCode(); + } + + public int compareTo(FireEventResponse other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + FireEventResponse typedOther = (FireEventResponse)other; + + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("FireEventResponse("); + boolean first = true; + + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + 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); + } + } + + private static class FireEventResponseStandardSchemeFactory implements SchemeFactory { + public FireEventResponseStandardScheme getScheme() { + return new FireEventResponseStandardScheme(); + } + } + + private static class FireEventResponseStandardScheme extends StandardScheme<FireEventResponse> { + + public void read(org.apache.thrift.protocol.TProtocol iprot, FireEventResponse struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, FireEventResponse struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class FireEventResponseTupleSchemeFactory implements SchemeFactory { + public FireEventResponseTupleScheme getScheme() { + return new FireEventResponseTupleScheme(); + } + } + + private static class FireEventResponseTupleScheme extends TupleScheme<FireEventResponse> { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, FireEventResponse struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, FireEventResponse struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + } + } + +} +
