commit 41d23816ec7ee884873cf492af4691ad49d0ca5d Author: Alan Gates Date: Fri Jan 8 18:15:33 2016 -0800 HIVE-12823 Thrift and RDBMS schema changes for HIVE-11956 diff --git metastore/if/hive_metastore.thrift metastore/if/hive_metastore.thrift index 7d1fe88..61a90f5 100755 --- metastore/if/hive_metastore.thrift +++ metastore/if/hive_metastore.thrift @@ -590,6 +590,7 @@ struct LockRequest { 2: optional i64 txnid, 3: required string user, // used in 'show locks' to help admins find who has open locks 4: required string hostname, // used in 'show locks' to help admins find who has open locks + 5: optional string agentInfo = "Unknown", } struct LockResponse { @@ -621,6 +622,7 @@ struct ShowLocksResponseElement { 10: required string user, 11: required string hostname, 12: optional i32 heartbeatCount = 0, + 13: optional string agentInfo, } struct ShowLocksResponse { diff --git metastore/scripts/upgrade/derby/030-HIVE-12823.derby.sql metastore/scripts/upgrade/derby/030-HIVE-12823.derby.sql new file mode 100644 index 0000000..b7fbc71 --- /dev/null +++ metastore/scripts/upgrade/derby/030-HIVE-12823.derby.sql @@ -0,0 +1 @@ +ALTER TABLE "HIVE_LOCKS" ADD "HL_AGENT_INFO" varchar(128); diff --git metastore/scripts/upgrade/derby/hive-txn-schema-1.3.0.derby.sql metastore/scripts/upgrade/derby/hive-txn-schema-1.3.0.derby.sql index 60e7eb0..143bd8a 100644 --- metastore/scripts/upgrade/derby/hive-txn-schema-1.3.0.derby.sql +++ metastore/scripts/upgrade/derby/hive-txn-schema-1.3.0.derby.sql @@ -61,6 +61,7 @@ CREATE TABLE HIVE_LOCKS ( HL_USER varchar(128) NOT NULL, HL_HOST varchar(128) NOT NULL, HL_HEARTBEAT_COUNT integer, + HL_AGENT_INFO varchar(128), PRIMARY KEY(HL_LOCK_EXT_ID, HL_LOCK_INT_ID) ); diff --git metastore/scripts/upgrade/derby/hive-txn-schema-2.0.0.derby.sql metastore/scripts/upgrade/derby/hive-txn-schema-2.0.0.derby.sql index f58a8ee..907be5a 100644 --- metastore/scripts/upgrade/derby/hive-txn-schema-2.0.0.derby.sql +++ metastore/scripts/upgrade/derby/hive-txn-schema-2.0.0.derby.sql @@ -61,6 +61,7 @@ CREATE TABLE HIVE_LOCKS ( HL_USER varchar(128) NOT NULL, HL_HOST varchar(128) NOT NULL, HL_HEARTBEAT_COUNT integer, + HL_AGENT_INFO varchar(128), PRIMARY KEY(HL_LOCK_EXT_ID, HL_LOCK_INT_ID) ); diff --git metastore/scripts/upgrade/derby/upgrade-1.2.0-to-1.3.0.derby.sql metastore/scripts/upgrade/derby/upgrade-1.2.0-to-1.3.0.derby.sql index f1b4b33..82f4fda 100644 --- metastore/scripts/upgrade/derby/upgrade-1.2.0-to-1.3.0.derby.sql +++ metastore/scripts/upgrade/derby/upgrade-1.2.0-to-1.3.0.derby.sql @@ -7,5 +7,6 @@ RUN '026-HIVE-12818.derby.sql'; RUN '027-HIVE-12819.derby.sql'; RUN '028-HIVE-12821.derby.sql'; RUN '029-HIVE-12822.derby.sql'; +RUN '030-HIVE-12823.derby.sql'; UPDATE "APP".VERSION SET SCHEMA_VERSION='1.3.0', VERSION_COMMENT='Hive release version 1.3.0' where VER_ID=1; diff --git metastore/scripts/upgrade/derby/upgrade-1.2.0-to-2.0.0.derby.sql metastore/scripts/upgrade/derby/upgrade-1.2.0-to-2.0.0.derby.sql index 0f26c15..679b58e 100644 --- metastore/scripts/upgrade/derby/upgrade-1.2.0-to-2.0.0.derby.sql +++ metastore/scripts/upgrade/derby/upgrade-1.2.0-to-2.0.0.derby.sql @@ -7,5 +7,6 @@ RUN '026-HIVE-12818.derby.sql'; RUN '027-HIVE-12819.derby.sql'; RUN '028-HIVE-12821.derby.sql'; RUN '029-HIVE-12822.derby.sql'; +RUN '030-HIVE-12823.derby.sql'; UPDATE "APP".VERSION SET SCHEMA_VERSION='2.0.0', VERSION_COMMENT='Hive release version 2.0.0' where VER_ID=1; diff --git metastore/scripts/upgrade/mssql/015-HIVE-12823.mssql.sql metastore/scripts/upgrade/mssql/015-HIVE-12823.mssql.sql new file mode 100644 index 0000000..d125b24 --- /dev/null +++ metastore/scripts/upgrade/mssql/015-HIVE-12823.mssql.sql @@ -0,0 +1 @@ +ALTER TABLE HIVE_LOCKS ADD HL_AGENT_INFO nvarchar(128) NULL; diff --git metastore/scripts/upgrade/mssql/hive-schema-1.3.0.mssql.sql metastore/scripts/upgrade/mssql/hive-schema-1.3.0.mssql.sql index 48886c9..5fc2917 100644 --- metastore/scripts/upgrade/mssql/hive-schema-1.3.0.mssql.sql +++ metastore/scripts/upgrade/mssql/hive-schema-1.3.0.mssql.sql @@ -916,6 +916,7 @@ CREATE TABLE HIVE_LOCKS( HL_USER nvarchar(128) NOT NULL, HL_HOST nvarchar(128) NOT NULL, HL_HEARTBEAT_COUNT int NULL, + HL_AGENT_INFO nvarchar(128) NULL, PRIMARY KEY CLUSTERED ( HL_LOCK_EXT_ID ASC, diff --git metastore/scripts/upgrade/mssql/hive-schema-2.0.0.mssql.sql metastore/scripts/upgrade/mssql/hive-schema-2.0.0.mssql.sql index 00b302e..0bd78fa 100644 --- metastore/scripts/upgrade/mssql/hive-schema-2.0.0.mssql.sql +++ metastore/scripts/upgrade/mssql/hive-schema-2.0.0.mssql.sql @@ -916,6 +916,7 @@ CREATE TABLE HIVE_LOCKS( HL_USER nvarchar(128) NOT NULL, HL_HOST nvarchar(128) NOT NULL, HL_HEARTBEAT_COUNT int NULL, + HL_AGENT_INFO nvarchar(128) NULL, PRIMARY KEY CLUSTERED ( HL_LOCK_EXT_ID ASC, diff --git metastore/scripts/upgrade/mssql/hive-schema-2.1.0.mssql.sql metastore/scripts/upgrade/mssql/hive-schema-2.1.0.mssql.sql index 7996b44..d195279 100644 --- metastore/scripts/upgrade/mssql/hive-schema-2.1.0.mssql.sql +++ metastore/scripts/upgrade/mssql/hive-schema-2.1.0.mssql.sql @@ -916,6 +916,7 @@ CREATE TABLE HIVE_LOCKS( HL_USER nvarchar(128) NOT NULL, HL_HOST nvarchar(128) NOT NULL, HL_HEARTBEAT_COUNT int NULL, + HL_AGENT_INFO nvarchar(128) NULL, PRIMARY KEY CLUSTERED ( HL_LOCK_EXT_ID ASC, diff --git metastore/scripts/upgrade/mssql/upgrade-1.2.0-to-1.3.0.mssql.sql metastore/scripts/upgrade/mssql/upgrade-1.2.0-to-1.3.0.mssql.sql index e6a1683..2df80be 100644 --- metastore/scripts/upgrade/mssql/upgrade-1.2.0-to-1.3.0.mssql.sql +++ metastore/scripts/upgrade/mssql/upgrade-1.2.0-to-1.3.0.mssql.sql @@ -8,6 +8,7 @@ SELECT 'Upgrading MetaStore schema from 1.2.0 to 1.3.0' AS MESSAGE; :r 012-HIVE-12819.mssql.sql; :r 013-HIVE-12821.mssql.sql; :r 014-HIVE-12822.mssql.sql; +:r 015-HIVE-12823.mssql.sql; UPDATE VERSION SET SCHEMA_VERSION='1.3.0', VERSION_COMMENT='Hive release version 1.3.0' where VER_ID=1; SELECT 'Finished upgrading MetaStore schema from 1.2.0 to 1.3.0' AS MESSAGE; diff --git metastore/scripts/upgrade/mssql/upgrade-1.2.0-to-2.0.0.mssql.sql metastore/scripts/upgrade/mssql/upgrade-1.2.0-to-2.0.0.mssql.sql index 268604e..c66f7b1 100644 --- metastore/scripts/upgrade/mssql/upgrade-1.2.0-to-2.0.0.mssql.sql +++ metastore/scripts/upgrade/mssql/upgrade-1.2.0-to-2.0.0.mssql.sql @@ -8,6 +8,7 @@ SELECT 'Upgrading MetaStore schema from 1.2.0 to 2.0.0' AS MESSAGE; :r 012-HIVE-12819.mssql.sql; :r 013-HIVE-12821.mssql.sql; :r 014-HIVE-12822.mssql.sql; +:r 015-HIVE-12823.mssql.sql; UPDATE VERSION SET SCHEMA_VERSION='2.0.0', VERSION_COMMENT='Hive release version 2.0.0' where VER_ID=1; SELECT 'Finished upgrading MetaStore schema from 1.2.0 to 2.0.0' AS MESSAGE; diff --git metastore/scripts/upgrade/mysql/030-HIVE-12823.mysql.sql metastore/scripts/upgrade/mysql/030-HIVE-12823.mysql.sql new file mode 100644 index 0000000..42c9b17 --- /dev/null +++ metastore/scripts/upgrade/mysql/030-HIVE-12823.mysql.sql @@ -0,0 +1 @@ +ALTER TABLE `HIVE_LOCKS` ADD `HL_AGENT_INFO` varchar(128); diff --git metastore/scripts/upgrade/mysql/hive-txn-schema-1.3.0.mysql.sql metastore/scripts/upgrade/mysql/hive-txn-schema-1.3.0.mysql.sql index f5797f3..07815e3 100644 --- metastore/scripts/upgrade/mysql/hive-txn-schema-1.3.0.mysql.sql +++ metastore/scripts/upgrade/mysql/hive-txn-schema-1.3.0.mysql.sql @@ -63,6 +63,7 @@ CREATE TABLE HIVE_LOCKS ( HL_USER varchar(128) NOT NULL, HL_HOST varchar(128) NOT NULL, HL_HEARTBEAT_COUNT int, + HL_AGENT_INFO varchar(128), PRIMARY KEY(HL_LOCK_EXT_ID, HL_LOCK_INT_ID), KEY HIVE_LOCK_TXNID_INDEX (HL_TXNID) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; diff --git metastore/scripts/upgrade/mysql/hive-txn-schema-2.0.0.mysql.sql metastore/scripts/upgrade/mysql/hive-txn-schema-2.0.0.mysql.sql index f5797f3..07815e3 100644 --- metastore/scripts/upgrade/mysql/hive-txn-schema-2.0.0.mysql.sql +++ metastore/scripts/upgrade/mysql/hive-txn-schema-2.0.0.mysql.sql @@ -63,6 +63,7 @@ CREATE TABLE HIVE_LOCKS ( HL_USER varchar(128) NOT NULL, HL_HOST varchar(128) NOT NULL, HL_HEARTBEAT_COUNT int, + HL_AGENT_INFO varchar(128), PRIMARY KEY(HL_LOCK_EXT_ID, HL_LOCK_INT_ID), KEY HIVE_LOCK_TXNID_INDEX (HL_TXNID) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; diff --git metastore/scripts/upgrade/mysql/upgrade-1.2.0-to-1.3.0.mysql.sql metastore/scripts/upgrade/mysql/upgrade-1.2.0-to-1.3.0.mysql.sql index 1b823a1..49a3551 100644 --- metastore/scripts/upgrade/mysql/upgrade-1.2.0-to-1.3.0.mysql.sql +++ metastore/scripts/upgrade/mysql/upgrade-1.2.0-to-1.3.0.mysql.sql @@ -8,6 +8,7 @@ SOURCE 026-HIVE-12818.mysql.sql; SOURCE 027-HIVE-12819.mysql.sql; SOURCE 028-HIVE-12821.mysql.sql; SOURCE 029-HIVE-12822.mysql.sql; +SOURCE 030-HIVE-12823.mysql.sql; UPDATE VERSION SET SCHEMA_VERSION='1.3.0', VERSION_COMMENT='Hive release version 1.3.0' where VER_ID=1; SELECT 'Finished upgrading MetaStore schema from 1.2.0 to 1.3.0' AS ' '; diff --git metastore/scripts/upgrade/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql metastore/scripts/upgrade/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql index bc3f3a4..6528645 100644 --- metastore/scripts/upgrade/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql +++ metastore/scripts/upgrade/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql @@ -8,6 +8,7 @@ SOURCE 026-HIVE-12818.mysql.sql; SOURCE 027-HIVE-12819.mysql.sql; SOURCE 028-HIVE-12821.mysql.sql; SOURCE 029-HIVE-12822.mysql.sql; +SOURCE 030-HIVE-12823.mysql.sql; UPDATE VERSION SET SCHEMA_VERSION='2.0.0', VERSION_COMMENT='Hive release version 2.0.0' where VER_ID=1; SELECT 'Finished upgrading MetaStore schema from 1.2.0 to 2.0.0' AS ' '; diff --git metastore/scripts/upgrade/oracle/030-HIVE-12823.oracle.sql metastore/scripts/upgrade/oracle/030-HIVE-12823.oracle.sql new file mode 100644 index 0000000..f938603 --- /dev/null +++ metastore/scripts/upgrade/oracle/030-HIVE-12823.oracle.sql @@ -0,0 +1 @@ +ALTER TABLE HIVE_LOCKS ADD HL_AGENT_INFO varchar2(128); diff --git metastore/scripts/upgrade/oracle/hive-txn-schema-1.3.0.oracle.sql metastore/scripts/upgrade/oracle/hive-txn-schema-1.3.0.oracle.sql index f9983c6..0e2d43e 100644 --- metastore/scripts/upgrade/oracle/hive-txn-schema-1.3.0.oracle.sql +++ metastore/scripts/upgrade/oracle/hive-txn-schema-1.3.0.oracle.sql @@ -62,6 +62,7 @@ CREATE TABLE HIVE_LOCKS ( HL_USER varchar(128) NOT NULL, HL_HOST varchar(128) NOT NULL, HL_HEARTBEAT_COUNT number(10), + HL_AGENT_INFO varchar2(128), PRIMARY KEY(HL_LOCK_EXT_ID, HL_LOCK_INT_ID) ) ROWDEPENDENCIES; diff --git metastore/scripts/upgrade/oracle/hive-txn-schema-2.0.0.oracle.sql metastore/scripts/upgrade/oracle/hive-txn-schema-2.0.0.oracle.sql index f9983c6..0e2d43e 100644 --- metastore/scripts/upgrade/oracle/hive-txn-schema-2.0.0.oracle.sql +++ metastore/scripts/upgrade/oracle/hive-txn-schema-2.0.0.oracle.sql @@ -62,6 +62,7 @@ CREATE TABLE HIVE_LOCKS ( HL_USER varchar(128) NOT NULL, HL_HOST varchar(128) NOT NULL, HL_HEARTBEAT_COUNT number(10), + HL_AGENT_INFO varchar2(128), PRIMARY KEY(HL_LOCK_EXT_ID, HL_LOCK_INT_ID) ) ROWDEPENDENCIES; diff --git metastore/scripts/upgrade/oracle/upgrade-1.2.0-to-1.3.0.oracle.sql metastore/scripts/upgrade/oracle/upgrade-1.2.0-to-1.3.0.oracle.sql index 7bb86c1..621826e 100644 --- metastore/scripts/upgrade/oracle/upgrade-1.2.0-to-1.3.0.oracle.sql +++ metastore/scripts/upgrade/oracle/upgrade-1.2.0-to-1.3.0.oracle.sql @@ -8,6 +8,7 @@ SELECT 'Upgrading MetaStore schema from 1.2.0 to 1.3.0' AS Status from dual; @027-HIVE-12819.oracle.sql; @028-HIVE-12821.oracle.sql; @029-HIVE-12822.oracle.sql; +@030-HIVE-12823.oracle.sql; UPDATE VERSION SET SCHEMA_VERSION='1.3.0', VERSION_COMMENT='Hive release version 1.3.0' where VER_ID=1; SELECT 'Finished upgrading MetaStore schema from 1.2.0 to 1.3.0' AS Status from dual; diff --git metastore/scripts/upgrade/oracle/upgrade-1.2.0-to-2.0.0.oracle.sql metastore/scripts/upgrade/oracle/upgrade-1.2.0-to-2.0.0.oracle.sql index e2e310a..d849b21 100644 --- metastore/scripts/upgrade/oracle/upgrade-1.2.0-to-2.0.0.oracle.sql +++ metastore/scripts/upgrade/oracle/upgrade-1.2.0-to-2.0.0.oracle.sql @@ -8,6 +8,7 @@ SELECT 'Upgrading MetaStore schema from 1.2.0 to 2.0.0' AS Status from dual; @027-HIVE-12819.oracle.sql; @028-HIVE-12821.oracle.sql; @029-HIVE-12822.oracle.sql; +@030-HIVE-12823.oracle.sql; UPDATE VERSION SET SCHEMA_VERSION='2.0.0', VERSION_COMMENT='Hive release version 2.0.0' where VER_ID=1; SELECT 'Finished upgrading MetaStore schema from 1.2.0 to 2.0.0' AS Status from dual; diff --git metastore/scripts/upgrade/postgres/029-HIVE-12823.postgres.sql metastore/scripts/upgrade/postgres/029-HIVE-12823.postgres.sql new file mode 100644 index 0000000..fc8206e --- /dev/null +++ metastore/scripts/upgrade/postgres/029-HIVE-12823.postgres.sql @@ -0,0 +1 @@ +ALTER TABLE "HIVE_LOCKS" ADD COLUMN "HL_AGENT_INFO" varchar(128); diff --git metastore/scripts/upgrade/postgres/hive-txn-schema-1.3.0.postgres.sql metastore/scripts/upgrade/postgres/hive-txn-schema-1.3.0.postgres.sql index 823ec82..085496b 100644 --- metastore/scripts/upgrade/postgres/hive-txn-schema-1.3.0.postgres.sql +++ metastore/scripts/upgrade/postgres/hive-txn-schema-1.3.0.postgres.sql @@ -62,6 +62,7 @@ CREATE TABLE HIVE_LOCKS ( HL_USER varchar(128) NOT NULL, HL_HOST varchar(128) NOT NULL, HL_HEARTBEAT_COUNT integer, + HL_AGENT_INFO varchar(128), PRIMARY KEY(HL_LOCK_EXT_ID, HL_LOCK_INT_ID) ); diff --git metastore/scripts/upgrade/postgres/hive-txn-schema-2.0.0.postgres.sql metastore/scripts/upgrade/postgres/hive-txn-schema-2.0.0.postgres.sql index 823ec82..085496b 100644 --- metastore/scripts/upgrade/postgres/hive-txn-schema-2.0.0.postgres.sql +++ metastore/scripts/upgrade/postgres/hive-txn-schema-2.0.0.postgres.sql @@ -62,6 +62,7 @@ CREATE TABLE HIVE_LOCKS ( HL_USER varchar(128) NOT NULL, HL_HOST varchar(128) NOT NULL, HL_HEARTBEAT_COUNT integer, + HL_AGENT_INFO varchar(128), PRIMARY KEY(HL_LOCK_EXT_ID, HL_LOCK_INT_ID) ); diff --git metastore/scripts/upgrade/postgres/upgrade-1.2.0-to-1.3.0.postgres.sql metastore/scripts/upgrade/postgres/upgrade-1.2.0-to-1.3.0.postgres.sql index 2235a49..9650b73 100644 --- metastore/scripts/upgrade/postgres/upgrade-1.2.0-to-1.3.0.postgres.sql +++ metastore/scripts/upgrade/postgres/upgrade-1.2.0-to-1.3.0.postgres.sql @@ -8,6 +8,7 @@ SELECT 'Upgrading MetaStore schema from 1.2.0 to 1.3.0'; \i 026-HIVE-12819.postgres.sql; \i 027-HIVE-12821.postgres.sql; \i 028-HIVE-12822.postgres.sql; +\i 029-HIVE-12823.postgres.sql; UPDATE "VERSION" SET "SCHEMA_VERSION"='1.3.0', "VERSION_COMMENT"='Hive release version 1.3.0' where "VER_ID"=1; SELECT 'Finished upgrading MetaStore schema from 1.2.0 to 1.3.0'; diff --git metastore/scripts/upgrade/postgres/upgrade-1.2.0-to-2.0.0.postgres.sql metastore/scripts/upgrade/postgres/upgrade-1.2.0-to-2.0.0.postgres.sql index 4166e2f..d53db6d 100644 --- metastore/scripts/upgrade/postgres/upgrade-1.2.0-to-2.0.0.postgres.sql +++ metastore/scripts/upgrade/postgres/upgrade-1.2.0-to-2.0.0.postgres.sql @@ -8,6 +8,7 @@ SELECT 'Upgrading MetaStore schema from 1.2.0 to 2.0.0'; \i 026-HIVE-12819.postgres.sql; \i 027-HIVE-12821.postgres.sql; \i 028-HIVE-12822.postgres.sql; +\i 029-HIVE-12823.postgres.sql; UPDATE "VERSION" SET "SCHEMA_VERSION"='2.0.0', "VERSION_COMMENT"='Hive release version 2.0.0' where "VER_ID"=1; SELECT 'Finished upgrading MetaStore schema from 1.2.0 to 2.0.0'; diff --git metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp index 5c96259..d918cc5 100644 --- metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp +++ metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp @@ -11079,6 +11079,11 @@ void LockRequest::__set_hostname(const std::string& val) { this->hostname = val; } +void LockRequest::__set_agentInfo(const std::string& val) { + this->agentInfo = val; +__isset.agentInfo = true; +} + uint32_t LockRequest::read(::apache::thrift::protocol::TProtocol* iprot) { apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); @@ -11147,6 +11152,14 @@ uint32_t LockRequest::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; + case 5: + if (ftype == ::apache::thrift::protocol::T_STRING) { + xfer += iprot->readString(this->agentInfo); + this->__isset.agentInfo = true; + } else { + xfer += iprot->skip(ftype); + } + break; default: xfer += iprot->skip(ftype); break; @@ -11195,6 +11208,11 @@ uint32_t LockRequest::write(::apache::thrift::protocol::TProtocol* oprot) const xfer += oprot->writeString(this->hostname); xfer += oprot->writeFieldEnd(); + if (this->__isset.agentInfo) { + xfer += oprot->writeFieldBegin("agentInfo", ::apache::thrift::protocol::T_STRING, 5); + xfer += oprot->writeString(this->agentInfo); + xfer += oprot->writeFieldEnd(); + } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); return xfer; @@ -11206,6 +11224,7 @@ void swap(LockRequest &a, LockRequest &b) { swap(a.txnid, b.txnid); swap(a.user, b.user); swap(a.hostname, b.hostname); + swap(a.agentInfo, b.agentInfo); swap(a.__isset, b.__isset); } @@ -11214,6 +11233,7 @@ LockRequest::LockRequest(const LockRequest& other508) { txnid = other508.txnid; user = other508.user; hostname = other508.hostname; + agentInfo = other508.agentInfo; __isset = other508.__isset; } LockRequest& LockRequest::operator=(const LockRequest& other509) { @@ -11221,6 +11241,7 @@ LockRequest& LockRequest::operator=(const LockRequest& other509) { txnid = other509.txnid; user = other509.user; hostname = other509.hostname; + agentInfo = other509.agentInfo; __isset = other509.__isset; return *this; } @@ -11231,6 +11252,7 @@ void LockRequest::printTo(std::ostream& out) const { out << ", " << "txnid="; (__isset.txnid ? (out << to_string(txnid)) : (out << "")); out << ", " << "user=" << to_string(user); out << ", " << "hostname=" << to_string(hostname); + out << ", " << "agentInfo="; (__isset.agentInfo ? (out << to_string(agentInfo)) : (out << "")); out << ")"; } @@ -11637,6 +11659,11 @@ void ShowLocksResponseElement::__set_heartbeatCount(const int32_t val) { __isset.heartbeatCount = true; } +void ShowLocksResponseElement::__set_agentInfo(const std::string& val) { + this->agentInfo = val; +__isset.agentInfo = true; +} + uint32_t ShowLocksResponseElement::read(::apache::thrift::protocol::TProtocol* iprot) { apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); @@ -11765,6 +11792,14 @@ uint32_t ShowLocksResponseElement::read(::apache::thrift::protocol::TProtocol* i xfer += iprot->skip(ftype); } break; + case 13: + if (ftype == ::apache::thrift::protocol::T_STRING) { + xfer += iprot->readString(this->agentInfo); + this->__isset.agentInfo = true; + } else { + xfer += iprot->skip(ftype); + } + break; default: xfer += iprot->skip(ftype); break; @@ -11849,6 +11884,11 @@ uint32_t ShowLocksResponseElement::write(::apache::thrift::protocol::TProtocol* xfer += oprot->writeI32(this->heartbeatCount); xfer += oprot->writeFieldEnd(); } + if (this->__isset.agentInfo) { + xfer += oprot->writeFieldBegin("agentInfo", ::apache::thrift::protocol::T_STRING, 13); + xfer += oprot->writeString(this->agentInfo); + xfer += oprot->writeFieldEnd(); + } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); return xfer; @@ -11868,6 +11908,7 @@ void swap(ShowLocksResponseElement &a, ShowLocksResponseElement &b) { swap(a.user, b.user); swap(a.hostname, b.hostname); swap(a.heartbeatCount, b.heartbeatCount); + swap(a.agentInfo, b.agentInfo); swap(a.__isset, b.__isset); } @@ -11884,6 +11925,7 @@ ShowLocksResponseElement::ShowLocksResponseElement(const ShowLocksResponseElemen user = other521.user; hostname = other521.hostname; heartbeatCount = other521.heartbeatCount; + agentInfo = other521.agentInfo; __isset = other521.__isset; } ShowLocksResponseElement& ShowLocksResponseElement::operator=(const ShowLocksResponseElement& other522) { @@ -11899,6 +11941,7 @@ ShowLocksResponseElement& ShowLocksResponseElement::operator=(const ShowLocksRes user = other522.user; hostname = other522.hostname; heartbeatCount = other522.heartbeatCount; + agentInfo = other522.agentInfo; __isset = other522.__isset; return *this; } @@ -11917,6 +11960,7 @@ void ShowLocksResponseElement::printTo(std::ostream& out) const { out << ", " << "user=" << to_string(user); out << ", " << "hostname=" << to_string(hostname); out << ", " << "heartbeatCount="; (__isset.heartbeatCount ? (out << to_string(heartbeatCount)) : (out << "")); + out << ", " << "agentInfo="; (__isset.agentInfo ? (out << to_string(agentInfo)) : (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 4c6e338..46b8d69 100644 --- metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h +++ metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h @@ -4533,8 +4533,9 @@ inline std::ostream& operator<<(std::ostream& out, const LockComponent& obj) } typedef struct _LockRequest__isset { - _LockRequest__isset() : txnid(false) {} + _LockRequest__isset() : txnid(false), agentInfo(true) {} bool txnid :1; + bool agentInfo :1; } _LockRequest__isset; class LockRequest { @@ -4542,7 +4543,7 @@ class LockRequest { LockRequest(const LockRequest&); LockRequest& operator=(const LockRequest&); - LockRequest() : txnid(0), user(), hostname() { + LockRequest() : txnid(0), user(), hostname(), agentInfo("Unknown") { } virtual ~LockRequest() throw(); @@ -4550,6 +4551,7 @@ class LockRequest { int64_t txnid; std::string user; std::string hostname; + std::string agentInfo; _LockRequest__isset __isset; @@ -4561,6 +4563,8 @@ class LockRequest { void __set_hostname(const std::string& val); + void __set_agentInfo(const std::string& val); + bool operator == (const LockRequest & rhs) const { if (!(component == rhs.component)) @@ -4573,6 +4577,10 @@ class LockRequest { return false; if (!(hostname == rhs.hostname)) return false; + if (__isset.agentInfo != rhs.__isset.agentInfo) + return false; + else if (__isset.agentInfo && !(agentInfo == rhs.agentInfo)) + return false; return true; } bool operator != (const LockRequest &rhs) const { @@ -4756,12 +4764,13 @@ inline std::ostream& operator<<(std::ostream& out, const ShowLocksRequest& obj) } typedef struct _ShowLocksResponseElement__isset { - _ShowLocksResponseElement__isset() : tablename(false), partname(false), txnid(false), acquiredat(false), heartbeatCount(true) {} + _ShowLocksResponseElement__isset() : tablename(false), partname(false), txnid(false), acquiredat(false), heartbeatCount(true), agentInfo(false) {} bool tablename :1; bool partname :1; bool txnid :1; bool acquiredat :1; bool heartbeatCount :1; + bool agentInfo :1; } _ShowLocksResponseElement__isset; class ShowLocksResponseElement { @@ -4769,7 +4778,7 @@ class ShowLocksResponseElement { ShowLocksResponseElement(const ShowLocksResponseElement&); ShowLocksResponseElement& operator=(const ShowLocksResponseElement&); - ShowLocksResponseElement() : lockid(0), dbname(), tablename(), partname(), state((LockState::type)0), type((LockType::type)0), txnid(0), lastheartbeat(0), acquiredat(0), user(), hostname(), heartbeatCount(0) { + ShowLocksResponseElement() : lockid(0), dbname(), tablename(), partname(), state((LockState::type)0), type((LockType::type)0), txnid(0), lastheartbeat(0), acquiredat(0), user(), hostname(), heartbeatCount(0), agentInfo() { } virtual ~ShowLocksResponseElement() throw(); @@ -4785,6 +4794,7 @@ class ShowLocksResponseElement { std::string user; std::string hostname; int32_t heartbeatCount; + std::string agentInfo; _ShowLocksResponseElement__isset __isset; @@ -4812,6 +4822,8 @@ class ShowLocksResponseElement { void __set_heartbeatCount(const int32_t val); + void __set_agentInfo(const std::string& val); + bool operator == (const ShowLocksResponseElement & rhs) const { if (!(lockid == rhs.lockid)) @@ -4848,6 +4860,10 @@ class ShowLocksResponseElement { return false; else if (__isset.heartbeatCount && !(heartbeatCount == rhs.heartbeatCount)) return false; + if (__isset.agentInfo != rhs.__isset.agentInfo) + return false; + else if (__isset.agentInfo && !(agentInfo == rhs.agentInfo)) + return false; return true; } bool operator != (const ShowLocksResponseElement &rhs) const { diff --git metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockRequest.java metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockRequest.java index eada4ee..f39f582 100644 --- metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockRequest.java +++ metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockRequest.java @@ -42,6 +42,7 @@ private static final org.apache.thrift.protocol.TField TXNID_FIELD_DESC = new org.apache.thrift.protocol.TField("txnid", org.apache.thrift.protocol.TType.I64, (short)2); private static final org.apache.thrift.protocol.TField USER_FIELD_DESC = new org.apache.thrift.protocol.TField("user", org.apache.thrift.protocol.TType.STRING, (short)3); private static final org.apache.thrift.protocol.TField HOSTNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("hostname", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField AGENT_INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("agentInfo", org.apache.thrift.protocol.TType.STRING, (short)5); private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -53,13 +54,15 @@ private long txnid; // optional private String user; // required private String hostname; // required + private String agentInfo; // 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 { COMPONENT((short)1, "component"), TXNID((short)2, "txnid"), USER((short)3, "user"), - HOSTNAME((short)4, "hostname"); + HOSTNAME((short)4, "hostname"), + AGENT_INFO((short)5, "agentInfo"); private static final Map byName = new HashMap(); @@ -82,6 +85,8 @@ public static _Fields findByThriftId(int fieldId) { return USER; case 4: // HOSTNAME return HOSTNAME; + case 5: // AGENT_INFO + return AGENT_INFO; default: return null; } @@ -124,7 +129,7 @@ public String getFieldName() { // isset id assignments private static final int __TXNID_ISSET_ID = 0; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.TXNID}; + private static final _Fields optionals[] = {_Fields.TXNID,_Fields.AGENT_INFO}; 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); @@ -137,11 +142,15 @@ public String getFieldName() { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.HOSTNAME, new org.apache.thrift.meta_data.FieldMetaData("hostname", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.AGENT_INFO, new org.apache.thrift.meta_data.FieldMetaData("agentInfo", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LockRequest.class, metaDataMap); } public LockRequest() { + this.agentInfo = "Unknown"; + } public LockRequest( @@ -174,6 +183,9 @@ public LockRequest(LockRequest other) { if (other.isSetHostname()) { this.hostname = other.hostname; } + if (other.isSetAgentInfo()) { + this.agentInfo = other.agentInfo; + } } public LockRequest deepCopy() { @@ -187,6 +199,8 @@ public void clear() { this.txnid = 0; this.user = null; this.hostname = null; + this.agentInfo = "Unknown"; + } public int getComponentSize() { @@ -295,6 +309,29 @@ public void setHostnameIsSet(boolean value) { } } + public String getAgentInfo() { + return this.agentInfo; + } + + public void setAgentInfo(String agentInfo) { + this.agentInfo = agentInfo; + } + + public void unsetAgentInfo() { + this.agentInfo = null; + } + + /** Returns true if field agentInfo is set (has been assigned a value) and false otherwise */ + public boolean isSetAgentInfo() { + return this.agentInfo != null; + } + + public void setAgentInfoIsSet(boolean value) { + if (!value) { + this.agentInfo = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case COMPONENT: @@ -329,6 +366,14 @@ public void setFieldValue(_Fields field, Object value) { } break; + case AGENT_INFO: + if (value == null) { + unsetAgentInfo(); + } else { + setAgentInfo((String)value); + } + break; + } } @@ -346,6 +391,9 @@ public Object getFieldValue(_Fields field) { case HOSTNAME: return getHostname(); + case AGENT_INFO: + return getAgentInfo(); + } throw new IllegalStateException(); } @@ -365,6 +413,8 @@ public boolean isSet(_Fields field) { return isSetUser(); case HOSTNAME: return isSetHostname(); + case AGENT_INFO: + return isSetAgentInfo(); } throw new IllegalStateException(); } @@ -418,6 +468,15 @@ public boolean equals(LockRequest that) { return false; } + boolean this_present_agentInfo = true && this.isSetAgentInfo(); + boolean that_present_agentInfo = true && that.isSetAgentInfo(); + if (this_present_agentInfo || that_present_agentInfo) { + if (!(this_present_agentInfo && that_present_agentInfo)) + return false; + if (!this.agentInfo.equals(that.agentInfo)) + return false; + } + return true; } @@ -445,6 +504,11 @@ public int hashCode() { if (present_hostname) list.add(hostname); + boolean present_agentInfo = true && (isSetAgentInfo()); + list.add(present_agentInfo); + if (present_agentInfo) + list.add(agentInfo); + return list.hashCode(); } @@ -496,6 +560,16 @@ public int compareTo(LockRequest other) { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetAgentInfo()).compareTo(other.isSetAgentInfo()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetAgentInfo()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.agentInfo, other.agentInfo); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -545,6 +619,16 @@ public String toString() { sb.append(this.hostname); } first = false; + if (isSetAgentInfo()) { + if (!first) sb.append(", "); + sb.append("agentInfo:"); + if (this.agentInfo == null) { + sb.append("null"); + } else { + sb.append(this.agentInfo); + } + first = false; + } sb.append(")"); return sb.toString(); } @@ -645,6 +729,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, LockRequest struct) org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 5: // AGENT_INFO + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.agentInfo = iprot.readString(); + struct.setAgentInfoIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -685,6 +777,13 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, LockRequest struct oprot.writeString(struct.hostname); oprot.writeFieldEnd(); } + if (struct.agentInfo != null) { + if (struct.isSetAgentInfo()) { + oprot.writeFieldBegin(AGENT_INFO_FIELD_DESC); + oprot.writeString(struct.agentInfo); + oprot.writeFieldEnd(); + } + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -715,10 +814,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, LockRequest struct) if (struct.isSetTxnid()) { optionals.set(0); } - oprot.writeBitSet(optionals, 1); + if (struct.isSetAgentInfo()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); if (struct.isSetTxnid()) { oprot.writeI64(struct.txnid); } + if (struct.isSetAgentInfo()) { + oprot.writeString(struct.agentInfo); + } } @Override @@ -740,11 +845,15 @@ public void read(org.apache.thrift.protocol.TProtocol prot, LockRequest struct) struct.setUserIsSet(true); struct.hostname = iprot.readString(); struct.setHostnameIsSet(true); - BitSet incoming = iprot.readBitSet(1); + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.txnid = iprot.readI64(); struct.setTxnidIsSet(true); } + if (incoming.get(1)) { + struct.agentInfo = iprot.readString(); + struct.setAgentInfoIsSet(true); + } } } diff --git metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponseElement.java metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponseElement.java index 4d49061..20a1944 100644 --- metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponseElement.java +++ metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponseElement.java @@ -50,6 +50,7 @@ private static final org.apache.thrift.protocol.TField USER_FIELD_DESC = new org.apache.thrift.protocol.TField("user", org.apache.thrift.protocol.TType.STRING, (short)10); private static final org.apache.thrift.protocol.TField HOSTNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("hostname", org.apache.thrift.protocol.TType.STRING, (short)11); private static final org.apache.thrift.protocol.TField HEARTBEAT_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("heartbeatCount", org.apache.thrift.protocol.TType.I32, (short)12); + private static final org.apache.thrift.protocol.TField AGENT_INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("agentInfo", org.apache.thrift.protocol.TType.STRING, (short)13); private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -69,6 +70,7 @@ private String user; // required private String hostname; // required private int heartbeatCount; // optional + private String agentInfo; // 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 { @@ -91,7 +93,8 @@ ACQUIREDAT((short)9, "acquiredat"), USER((short)10, "user"), HOSTNAME((short)11, "hostname"), - HEARTBEAT_COUNT((short)12, "heartbeatCount"); + HEARTBEAT_COUNT((short)12, "heartbeatCount"), + AGENT_INFO((short)13, "agentInfo"); private static final Map byName = new HashMap(); @@ -130,6 +133,8 @@ public static _Fields findByThriftId(int fieldId) { return HOSTNAME; case 12: // HEARTBEAT_COUNT return HEARTBEAT_COUNT; + case 13: // AGENT_INFO + return AGENT_INFO; default: return null; } @@ -176,7 +181,7 @@ public String getFieldName() { private static final int __ACQUIREDAT_ISSET_ID = 3; private static final int __HEARTBEATCOUNT_ISSET_ID = 4; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.TABLENAME,_Fields.PARTNAME,_Fields.TXNID,_Fields.ACQUIREDAT,_Fields.HEARTBEAT_COUNT}; + private static final _Fields optionals[] = {_Fields.TABLENAME,_Fields.PARTNAME,_Fields.TXNID,_Fields.ACQUIREDAT,_Fields.HEARTBEAT_COUNT,_Fields.AGENT_INFO}; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -204,6 +209,8 @@ public String getFieldName() { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.HEARTBEAT_COUNT, new org.apache.thrift.meta_data.FieldMetaData("heartbeatCount", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.AGENT_INFO, new org.apache.thrift.meta_data.FieldMetaData("agentInfo", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ShowLocksResponseElement.class, metaDataMap); } @@ -265,6 +272,9 @@ public ShowLocksResponseElement(ShowLocksResponseElement other) { this.hostname = other.hostname; } this.heartbeatCount = other.heartbeatCount; + if (other.isSetAgentInfo()) { + this.agentInfo = other.agentInfo; + } } public ShowLocksResponseElement deepCopy() { @@ -290,6 +300,7 @@ public void clear() { this.hostname = null; this.heartbeatCount = 0; + this.agentInfo = null; } public long getLockid() { @@ -579,6 +590,29 @@ public void setHeartbeatCountIsSet(boolean value) { __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __HEARTBEATCOUNT_ISSET_ID, value); } + public String getAgentInfo() { + return this.agentInfo; + } + + public void setAgentInfo(String agentInfo) { + this.agentInfo = agentInfo; + } + + public void unsetAgentInfo() { + this.agentInfo = null; + } + + /** Returns true if field agentInfo is set (has been assigned a value) and false otherwise */ + public boolean isSetAgentInfo() { + return this.agentInfo != null; + } + + public void setAgentInfoIsSet(boolean value) { + if (!value) { + this.agentInfo = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case LOCKID: @@ -677,6 +711,14 @@ public void setFieldValue(_Fields field, Object value) { } break; + case AGENT_INFO: + if (value == null) { + unsetAgentInfo(); + } else { + setAgentInfo((String)value); + } + break; + } } @@ -718,6 +760,9 @@ public Object getFieldValue(_Fields field) { case HEARTBEAT_COUNT: return getHeartbeatCount(); + case AGENT_INFO: + return getAgentInfo(); + } throw new IllegalStateException(); } @@ -753,6 +798,8 @@ public boolean isSet(_Fields field) { return isSetHostname(); case HEARTBEAT_COUNT: return isSetHeartbeatCount(); + case AGENT_INFO: + return isSetAgentInfo(); } throw new IllegalStateException(); } @@ -878,6 +925,15 @@ public boolean equals(ShowLocksResponseElement that) { return false; } + boolean this_present_agentInfo = true && this.isSetAgentInfo(); + boolean that_present_agentInfo = true && that.isSetAgentInfo(); + if (this_present_agentInfo || that_present_agentInfo) { + if (!(this_present_agentInfo && that_present_agentInfo)) + return false; + if (!this.agentInfo.equals(that.agentInfo)) + return false; + } + return true; } @@ -945,6 +1001,11 @@ public int hashCode() { if (present_heartbeatCount) list.add(heartbeatCount); + boolean present_agentInfo = true && (isSetAgentInfo()); + list.add(present_agentInfo); + if (present_agentInfo) + list.add(agentInfo); + return list.hashCode(); } @@ -1076,6 +1137,16 @@ public int compareTo(ShowLocksResponseElement other) { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetAgentInfo()).compareTo(other.isSetAgentInfo()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetAgentInfo()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.agentInfo, other.agentInfo); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -1181,6 +1252,16 @@ public String toString() { sb.append(this.heartbeatCount); first = false; } + if (isSetAgentInfo()) { + if (!first) sb.append(", "); + sb.append("agentInfo:"); + if (this.agentInfo == null) { + sb.append("null"); + } else { + sb.append(this.agentInfo); + } + first = false; + } sb.append(")"); return sb.toString(); } @@ -1350,6 +1431,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, ShowLocksResponseEl org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 13: // AGENT_INFO + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.agentInfo = iprot.readString(); + struct.setAgentInfoIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1423,6 +1512,13 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ShowLocksResponseE oprot.writeI32(struct.heartbeatCount); oprot.writeFieldEnd(); } + if (struct.agentInfo != null) { + if (struct.isSetAgentInfo()) { + oprot.writeFieldBegin(AGENT_INFO_FIELD_DESC); + oprot.writeString(struct.agentInfo); + oprot.writeFieldEnd(); + } + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -1463,7 +1559,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ShowLocksResponseEl if (struct.isSetHeartbeatCount()) { optionals.set(4); } - oprot.writeBitSet(optionals, 5); + if (struct.isSetAgentInfo()) { + optionals.set(5); + } + oprot.writeBitSet(optionals, 6); if (struct.isSetTablename()) { oprot.writeString(struct.tablename); } @@ -1479,6 +1578,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ShowLocksResponseEl if (struct.isSetHeartbeatCount()) { oprot.writeI32(struct.heartbeatCount); } + if (struct.isSetAgentInfo()) { + oprot.writeString(struct.agentInfo); + } } @Override @@ -1498,7 +1600,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, ShowLocksResponseEle struct.setUserIsSet(true); struct.hostname = iprot.readString(); struct.setHostnameIsSet(true); - BitSet incoming = iprot.readBitSet(5); + BitSet incoming = iprot.readBitSet(6); if (incoming.get(0)) { struct.tablename = iprot.readString(); struct.setTablenameIsSet(true); @@ -1519,6 +1621,10 @@ public void read(org.apache.thrift.protocol.TProtocol prot, ShowLocksResponseEle struct.heartbeatCount = iprot.readI32(); struct.setHeartbeatCountIsSet(true); } + if (incoming.get(5)) { + struct.agentInfo = iprot.readString(); + struct.setAgentInfoIsSet(true); + } } } diff --git metastore/src/gen/thrift/gen-php/metastore/Types.php metastore/src/gen/thrift/gen-php/metastore/Types.php index e91c59a..bc11ea3 100644 --- metastore/src/gen/thrift/gen-php/metastore/Types.php +++ metastore/src/gen/thrift/gen-php/metastore/Types.php @@ -11118,6 +11118,10 @@ class LockRequest { * @var string */ public $hostname = null; + /** + * @var string + */ + public $agentInfo = "Unknown"; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -11143,6 +11147,10 @@ class LockRequest { 'var' => 'hostname', 'type' => TType::STRING, ), + 5 => array( + 'var' => 'agentInfo', + 'type' => TType::STRING, + ), ); } if (is_array($vals)) { @@ -11158,6 +11166,9 @@ class LockRequest { if (isset($vals['hostname'])) { $this->hostname = $vals['hostname']; } + if (isset($vals['agentInfo'])) { + $this->agentInfo = $vals['agentInfo']; + } } } @@ -11219,6 +11230,13 @@ class LockRequest { $xfer += $input->skip($ftype); } break; + case 5: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->agentInfo); + } else { + $xfer += $input->skip($ftype); + } + break; default: $xfer += $input->skip($ftype); break; @@ -11264,6 +11282,11 @@ class LockRequest { $xfer += $output->writeString($this->hostname); $xfer += $output->writeFieldEnd(); } + if ($this->agentInfo !== null) { + $xfer += $output->writeFieldBegin('agentInfo', TType::STRING, 5); + $xfer += $output->writeString($this->agentInfo); + $xfer += $output->writeFieldEnd(); + } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; @@ -11620,6 +11643,10 @@ class ShowLocksResponseElement { * @var int */ public $heartbeatCount = 0; + /** + * @var string + */ + public $agentInfo = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -11672,6 +11699,10 @@ class ShowLocksResponseElement { 'var' => 'heartbeatCount', 'type' => TType::I32, ), + 13 => array( + 'var' => 'agentInfo', + 'type' => TType::STRING, + ), ); } if (is_array($vals)) { @@ -11711,6 +11742,9 @@ class ShowLocksResponseElement { if (isset($vals['heartbeatCount'])) { $this->heartbeatCount = $vals['heartbeatCount']; } + if (isset($vals['agentInfo'])) { + $this->agentInfo = $vals['agentInfo']; + } } } @@ -11817,6 +11851,13 @@ class ShowLocksResponseElement { $xfer += $input->skip($ftype); } break; + case 13: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->agentInfo); + } else { + $xfer += $input->skip($ftype); + } + break; default: $xfer += $input->skip($ftype); break; @@ -11890,6 +11931,11 @@ class ShowLocksResponseElement { $xfer += $output->writeI32($this->heartbeatCount); $xfer += $output->writeFieldEnd(); } + if ($this->agentInfo !== null) { + $xfer += $output->writeFieldBegin('agentInfo', TType::STRING, 13); + $xfer += $output->writeString($this->agentInfo); + $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 f2e7f3c..12de753 100644 --- metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py +++ metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py @@ -7691,6 +7691,7 @@ class LockRequest: - txnid - user - hostname + - agentInfo """ thrift_spec = ( @@ -7699,13 +7700,15 @@ class LockRequest: (2, TType.I64, 'txnid', None, None, ), # 2 (3, TType.STRING, 'user', None, None, ), # 3 (4, TType.STRING, 'hostname', None, None, ), # 4 + (5, TType.STRING, 'agentInfo', None, "Unknown", ), # 5 ) - def __init__(self, component=None, txnid=None, user=None, hostname=None,): + def __init__(self, component=None, txnid=None, user=None, hostname=None, agentInfo=thrift_spec[5][4],): self.component = component self.txnid = txnid self.user = user self.hostname = hostname + self.agentInfo = agentInfo 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: @@ -7742,6 +7745,11 @@ def read(self, iprot): self.hostname = iprot.readString() else: iprot.skip(ftype) + elif fid == 5: + if ftype == TType.STRING: + self.agentInfo = iprot.readString() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -7771,6 +7779,10 @@ def write(self, oprot): oprot.writeFieldBegin('hostname', TType.STRING, 4) oprot.writeString(self.hostname) oprot.writeFieldEnd() + if self.agentInfo is not None: + oprot.writeFieldBegin('agentInfo', TType.STRING, 5) + oprot.writeString(self.agentInfo) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -7790,6 +7802,7 @@ def __hash__(self): value = (value * 31) ^ hash(self.txnid) value = (value * 31) ^ hash(self.user) value = (value * 31) ^ hash(self.hostname) + value = (value * 31) ^ hash(self.agentInfo) return value def __repr__(self): @@ -8080,6 +8093,7 @@ class ShowLocksResponseElement: - user - hostname - heartbeatCount + - agentInfo """ thrift_spec = ( @@ -8096,9 +8110,10 @@ class ShowLocksResponseElement: (10, TType.STRING, 'user', None, None, ), # 10 (11, TType.STRING, 'hostname', None, None, ), # 11 (12, TType.I32, 'heartbeatCount', None, 0, ), # 12 + (13, TType.STRING, 'agentInfo', None, None, ), # 13 ) - def __init__(self, lockid=None, dbname=None, tablename=None, partname=None, state=None, type=None, txnid=None, lastheartbeat=None, acquiredat=None, user=None, hostname=None, heartbeatCount=thrift_spec[12][4],): + def __init__(self, lockid=None, dbname=None, tablename=None, partname=None, state=None, type=None, txnid=None, lastheartbeat=None, acquiredat=None, user=None, hostname=None, heartbeatCount=thrift_spec[12][4], agentInfo=None,): self.lockid = lockid self.dbname = dbname self.tablename = tablename @@ -8111,6 +8126,7 @@ def __init__(self, lockid=None, dbname=None, tablename=None, partname=None, stat self.user = user self.hostname = hostname self.heartbeatCount = heartbeatCount + self.agentInfo = agentInfo 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: @@ -8181,6 +8197,11 @@ def read(self, iprot): self.heartbeatCount = iprot.readI32() else: iprot.skip(ftype) + elif fid == 13: + if ftype == TType.STRING: + self.agentInfo = iprot.readString() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -8239,6 +8260,10 @@ def write(self, oprot): oprot.writeFieldBegin('heartbeatCount', TType.I32, 12) oprot.writeI32(self.heartbeatCount) oprot.writeFieldEnd() + if self.agentInfo is not None: + oprot.writeFieldBegin('agentInfo', TType.STRING, 13) + oprot.writeString(self.agentInfo) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -8274,6 +8299,7 @@ def __hash__(self): value = (value * 31) ^ hash(self.user) value = (value * 31) ^ hash(self.hostname) value = (value * 31) ^ hash(self.heartbeatCount) + value = (value * 31) ^ hash(self.agentInfo) 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 f4e360b..6a95a95 100644 --- metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb +++ metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb @@ -1742,12 +1742,14 @@ class LockRequest TXNID = 2 USER = 3 HOSTNAME = 4 + AGENTINFO = 5 FIELDS = { COMPONENT => {:type => ::Thrift::Types::LIST, :name => 'component', :element => {:type => ::Thrift::Types::STRUCT, :class => ::LockComponent}}, TXNID => {:type => ::Thrift::Types::I64, :name => 'txnid', :optional => true}, USER => {:type => ::Thrift::Types::STRING, :name => 'user'}, - HOSTNAME => {:type => ::Thrift::Types::STRING, :name => 'hostname'} + HOSTNAME => {:type => ::Thrift::Types::STRING, :name => 'hostname'}, + AGENTINFO => {:type => ::Thrift::Types::STRING, :name => 'agentInfo', :default => %q"Unknown", :optional => true} } def struct_fields; FIELDS; end @@ -1847,6 +1849,7 @@ class ShowLocksResponseElement USER = 10 HOSTNAME = 11 HEARTBEATCOUNT = 12 + AGENTINFO = 13 FIELDS = { LOCKID => {:type => ::Thrift::Types::I64, :name => 'lockid'}, @@ -1860,7 +1863,8 @@ class ShowLocksResponseElement ACQUIREDAT => {:type => ::Thrift::Types::I64, :name => 'acquiredat', :optional => true}, USER => {:type => ::Thrift::Types::STRING, :name => 'user'}, HOSTNAME => {:type => ::Thrift::Types::STRING, :name => 'hostname'}, - HEARTBEATCOUNT => {:type => ::Thrift::Types::I32, :name => 'heartbeatCount', :default => 0, :optional => true} + HEARTBEATCOUNT => {:type => ::Thrift::Types::I32, :name => 'heartbeatCount', :default => 0, :optional => true}, + AGENTINFO => {:type => ::Thrift::Types::STRING, :name => 'agentInfo', :optional => true} } def struct_fields; FIELDS; end