You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by na...@apache.org on 2012/06/01 21:35:51 UTC
svn commit: r1345318 [3/7] - in /hive/trunk: metastore/if/
metastore/scripts/upgrade/mysql/ metastore/scripts/upgrade/oracle/
metastore/src/gen/thrift/gen-cpp/
metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/
metastore/src/ge...
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=1345318&r1=1345317&r2=1345318&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 Fri Jun 1 19:35:49 2012
@@ -1490,8 +1490,73 @@ uint32_t StorageDescriptor::write(::apac
return xfer;
}
-const char* Table::ascii_fingerprint = "26BE788C09746068A2616712C9262900";
-const uint8_t Table::binary_fingerprint[16] = {0x26,0xBE,0x78,0x8C,0x09,0x74,0x60,0x68,0xA2,0x61,0x67,0x12,0xC9,0x26,0x29,0x00};
+const char* TableIdentifier::ascii_fingerprint = "07A9615F837F7D0A952B595DD3020972";
+const uint8_t TableIdentifier::binary_fingerprint[16] = {0x07,0xA9,0x61,0x5F,0x83,0x7F,0x7D,0x0A,0x95,0x2B,0x59,0x5D,0xD3,0x02,0x09,0x72};
+
+uint32_t TableIdentifier::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_STRING) {
+ xfer += iprot->readString(this->dbName);
+ this->__isset.dbName = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->tableName);
+ this->__isset.tableName = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ return xfer;
+}
+
+uint32_t TableIdentifier::write(::apache::thrift::protocol::TProtocol* oprot) const {
+ uint32_t xfer = 0;
+ xfer += oprot->writeStructBegin("TableIdentifier");
+ xfer += oprot->writeFieldBegin("dbName", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString(this->dbName);
+ xfer += oprot->writeFieldEnd();
+ xfer += oprot->writeFieldBegin("tableName", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString(this->tableName);
+ xfer += oprot->writeFieldEnd();
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+const char* Table::ascii_fingerprint = "06C17A4A74B309FF2357999371777D0D";
+const uint8_t Table::binary_fingerprint[16] = {0x06,0xC1,0x7A,0x4A,0x74,0xB3,0x09,0xFF,0x23,0x57,0x99,0x93,0x71,0x77,0x7D,0x0D};
uint32_t Table::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -1644,6 +1709,34 @@ uint32_t Table::read(::apache::thrift::p
xfer += iprot->skip(ftype);
}
break;
+ case 14:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->linkTarget.read(iprot);
+ this->__isset.linkTarget = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 15:
+ if (ftype == ::apache::thrift::protocol::T_LIST) {
+ {
+ this->linkTables.clear();
+ uint32_t _size117;
+ ::apache::thrift::protocol::TType _etype120;
+ iprot->readListBegin(_etype120, _size117);
+ this->linkTables.resize(_size117);
+ uint32_t _i121;
+ for (_i121 = 0; _i121 < _size117; ++_i121)
+ {
+ xfer += this->linkTables[_i121].read(iprot);
+ }
+ iprot->readListEnd();
+ }
+ this->__isset.linkTables = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
default:
xfer += iprot->skip(ftype);
break;
@@ -1683,10 +1776,10 @@ uint32_t Table::write(::apache::thrift::
xfer += oprot->writeFieldBegin("partitionKeys", ::apache::thrift::protocol::T_LIST, 8);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->partitionKeys.size()));
- std::vector<FieldSchema> ::const_iterator _iter117;
- for (_iter117 = this->partitionKeys.begin(); _iter117 != this->partitionKeys.end(); ++_iter117)
+ std::vector<FieldSchema> ::const_iterator _iter122;
+ for (_iter122 = this->partitionKeys.begin(); _iter122 != this->partitionKeys.end(); ++_iter122)
{
- xfer += (*_iter117).write(oprot);
+ xfer += (*_iter122).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -1694,11 +1787,11 @@ uint32_t Table::write(::apache::thrift::
xfer += oprot->writeFieldBegin("parameters", ::apache::thrift::protocol::T_MAP, 9);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->parameters.size()));
- std::map<std::string, std::string> ::const_iterator _iter118;
- for (_iter118 = this->parameters.begin(); _iter118 != this->parameters.end(); ++_iter118)
+ std::map<std::string, std::string> ::const_iterator _iter123;
+ for (_iter123 = this->parameters.begin(); _iter123 != this->parameters.end(); ++_iter123)
{
- xfer += oprot->writeString(_iter118->first);
- xfer += oprot->writeString(_iter118->second);
+ xfer += oprot->writeString(_iter123->first);
+ xfer += oprot->writeString(_iter123->second);
}
xfer += oprot->writeMapEnd();
}
@@ -1717,6 +1810,24 @@ uint32_t Table::write(::apache::thrift::
xfer += this->privileges.write(oprot);
xfer += oprot->writeFieldEnd();
}
+ if (this->__isset.linkTarget) {
+ xfer += oprot->writeFieldBegin("linkTarget", ::apache::thrift::protocol::T_STRUCT, 14);
+ xfer += this->linkTarget.write(oprot);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.linkTables) {
+ xfer += oprot->writeFieldBegin("linkTables", ::apache::thrift::protocol::T_LIST, 15);
+ {
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->linkTables.size()));
+ std::vector<TableIdentifier> ::const_iterator _iter124;
+ for (_iter124 = this->linkTables.begin(); _iter124 != this->linkTables.end(); ++_iter124)
+ {
+ xfer += (*_iter124).write(oprot);
+ }
+ xfer += oprot->writeListEnd();
+ }
+ xfer += oprot->writeFieldEnd();
+ }
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -1749,14 +1860,14 @@ uint32_t Partition::read(::apache::thrif
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->values.clear();
- uint32_t _size119;
- ::apache::thrift::protocol::TType _etype122;
- iprot->readListBegin(_etype122, _size119);
- this->values.resize(_size119);
- uint32_t _i123;
- for (_i123 = 0; _i123 < _size119; ++_i123)
+ uint32_t _size125;
+ ::apache::thrift::protocol::TType _etype128;
+ iprot->readListBegin(_etype128, _size125);
+ this->values.resize(_size125);
+ uint32_t _i129;
+ for (_i129 = 0; _i129 < _size125; ++_i129)
{
- xfer += iprot->readString(this->values[_i123]);
+ xfer += iprot->readString(this->values[_i129]);
}
iprot->readListEnd();
}
@@ -1809,17 +1920,17 @@ uint32_t Partition::read(::apache::thrif
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->parameters.clear();
- uint32_t _size124;
- ::apache::thrift::protocol::TType _ktype125;
- ::apache::thrift::protocol::TType _vtype126;
- iprot->readMapBegin(_ktype125, _vtype126, _size124);
- uint32_t _i128;
- for (_i128 = 0; _i128 < _size124; ++_i128)
+ uint32_t _size130;
+ ::apache::thrift::protocol::TType _ktype131;
+ ::apache::thrift::protocol::TType _vtype132;
+ iprot->readMapBegin(_ktype131, _vtype132, _size130);
+ uint32_t _i134;
+ for (_i134 = 0; _i134 < _size130; ++_i134)
{
- std::string _key129;
- xfer += iprot->readString(_key129);
- std::string& _val130 = this->parameters[_key129];
- xfer += iprot->readString(_val130);
+ std::string _key135;
+ xfer += iprot->readString(_key135);
+ std::string& _val136 = this->parameters[_key135];
+ xfer += iprot->readString(_val136);
}
iprot->readMapEnd();
}
@@ -1854,10 +1965,10 @@ uint32_t Partition::write(::apache::thri
xfer += oprot->writeFieldBegin("values", ::apache::thrift::protocol::T_LIST, 1);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->values.size()));
- std::vector<std::string> ::const_iterator _iter131;
- for (_iter131 = this->values.begin(); _iter131 != this->values.end(); ++_iter131)
+ std::vector<std::string> ::const_iterator _iter137;
+ for (_iter137 = this->values.begin(); _iter137 != this->values.end(); ++_iter137)
{
- xfer += oprot->writeString((*_iter131));
+ xfer += oprot->writeString((*_iter137));
}
xfer += oprot->writeListEnd();
}
@@ -1880,11 +1991,11 @@ uint32_t Partition::write(::apache::thri
xfer += oprot->writeFieldBegin("parameters", ::apache::thrift::protocol::T_MAP, 7);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->parameters.size()));
- std::map<std::string, std::string> ::const_iterator _iter132;
- for (_iter132 = this->parameters.begin(); _iter132 != this->parameters.end(); ++_iter132)
+ std::map<std::string, std::string> ::const_iterator _iter138;
+ for (_iter138 = this->parameters.begin(); _iter138 != this->parameters.end(); ++_iter138)
{
- xfer += oprot->writeString(_iter132->first);
- xfer += oprot->writeString(_iter132->second);
+ xfer += oprot->writeString(_iter138->first);
+ xfer += oprot->writeString(_iter138->second);
}
xfer += oprot->writeMapEnd();
}
@@ -1990,17 +2101,17 @@ uint32_t Index::read(::apache::thrift::p
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->parameters.clear();
- uint32_t _size133;
- ::apache::thrift::protocol::TType _ktype134;
- ::apache::thrift::protocol::TType _vtype135;
- iprot->readMapBegin(_ktype134, _vtype135, _size133);
- uint32_t _i137;
- for (_i137 = 0; _i137 < _size133; ++_i137)
+ uint32_t _size139;
+ ::apache::thrift::protocol::TType _ktype140;
+ ::apache::thrift::protocol::TType _vtype141;
+ iprot->readMapBegin(_ktype140, _vtype141, _size139);
+ uint32_t _i143;
+ for (_i143 = 0; _i143 < _size139; ++_i143)
{
- std::string _key138;
- xfer += iprot->readString(_key138);
- std::string& _val139 = this->parameters[_key138];
- xfer += iprot->readString(_val139);
+ std::string _key144;
+ xfer += iprot->readString(_key144);
+ std::string& _val145 = this->parameters[_key144];
+ xfer += iprot->readString(_val145);
}
iprot->readMapEnd();
}
@@ -2059,11 +2170,11 @@ uint32_t Index::write(::apache::thrift::
xfer += oprot->writeFieldBegin("parameters", ::apache::thrift::protocol::T_MAP, 9);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->parameters.size()));
- std::map<std::string, std::string> ::const_iterator _iter140;
- for (_iter140 = this->parameters.begin(); _iter140 != this->parameters.end(); ++_iter140)
+ std::map<std::string, std::string> ::const_iterator _iter146;
+ for (_iter146 = this->parameters.begin(); _iter146 != this->parameters.end(); ++_iter146)
{
- xfer += oprot->writeString(_iter140->first);
- xfer += oprot->writeString(_iter140->second);
+ xfer += oprot->writeString(_iter146->first);
+ xfer += oprot->writeString(_iter146->second);
}
xfer += oprot->writeMapEnd();
}
@@ -2103,14 +2214,14 @@ uint32_t Schema::read(::apache::thrift::
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->fieldSchemas.clear();
- uint32_t _size141;
- ::apache::thrift::protocol::TType _etype144;
- iprot->readListBegin(_etype144, _size141);
- this->fieldSchemas.resize(_size141);
- uint32_t _i145;
- for (_i145 = 0; _i145 < _size141; ++_i145)
+ uint32_t _size147;
+ ::apache::thrift::protocol::TType _etype150;
+ iprot->readListBegin(_etype150, _size147);
+ this->fieldSchemas.resize(_size147);
+ uint32_t _i151;
+ for (_i151 = 0; _i151 < _size147; ++_i151)
{
- xfer += this->fieldSchemas[_i145].read(iprot);
+ xfer += this->fieldSchemas[_i151].read(iprot);
}
iprot->readListEnd();
}
@@ -2123,17 +2234,17 @@ uint32_t Schema::read(::apache::thrift::
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->properties.clear();
- uint32_t _size146;
- ::apache::thrift::protocol::TType _ktype147;
- ::apache::thrift::protocol::TType _vtype148;
- iprot->readMapBegin(_ktype147, _vtype148, _size146);
- uint32_t _i150;
- for (_i150 = 0; _i150 < _size146; ++_i150)
+ uint32_t _size152;
+ ::apache::thrift::protocol::TType _ktype153;
+ ::apache::thrift::protocol::TType _vtype154;
+ iprot->readMapBegin(_ktype153, _vtype154, _size152);
+ uint32_t _i156;
+ for (_i156 = 0; _i156 < _size152; ++_i156)
{
- std::string _key151;
- xfer += iprot->readString(_key151);
- std::string& _val152 = this->properties[_key151];
- xfer += iprot->readString(_val152);
+ std::string _key157;
+ xfer += iprot->readString(_key157);
+ std::string& _val158 = this->properties[_key157];
+ xfer += iprot->readString(_val158);
}
iprot->readMapEnd();
}
@@ -2160,10 +2271,10 @@ uint32_t Schema::write(::apache::thrift:
xfer += oprot->writeFieldBegin("fieldSchemas", ::apache::thrift::protocol::T_LIST, 1);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->fieldSchemas.size()));
- std::vector<FieldSchema> ::const_iterator _iter153;
- for (_iter153 = this->fieldSchemas.begin(); _iter153 != this->fieldSchemas.end(); ++_iter153)
+ std::vector<FieldSchema> ::const_iterator _iter159;
+ for (_iter159 = this->fieldSchemas.begin(); _iter159 != this->fieldSchemas.end(); ++_iter159)
{
- xfer += (*_iter153).write(oprot);
+ xfer += (*_iter159).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -2171,11 +2282,11 @@ uint32_t Schema::write(::apache::thrift:
xfer += oprot->writeFieldBegin("properties", ::apache::thrift::protocol::T_MAP, 2);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->properties.size()));
- std::map<std::string, std::string> ::const_iterator _iter154;
- for (_iter154 = this->properties.begin(); _iter154 != this->properties.end(); ++_iter154)
+ std::map<std::string, std::string> ::const_iterator _iter160;
+ for (_iter160 = this->properties.begin(); _iter160 != this->properties.end(); ++_iter160)
{
- xfer += oprot->writeString(_iter154->first);
- xfer += oprot->writeString(_iter154->second);
+ xfer += oprot->writeString(_iter160->first);
+ xfer += oprot->writeString(_iter160->second);
}
xfer += oprot->writeMapEnd();
}
@@ -2212,17 +2323,17 @@ uint32_t EnvironmentContext::read(::apac
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->properties.clear();
- uint32_t _size155;
- ::apache::thrift::protocol::TType _ktype156;
- ::apache::thrift::protocol::TType _vtype157;
- iprot->readMapBegin(_ktype156, _vtype157, _size155);
- uint32_t _i159;
- for (_i159 = 0; _i159 < _size155; ++_i159)
+ uint32_t _size161;
+ ::apache::thrift::protocol::TType _ktype162;
+ ::apache::thrift::protocol::TType _vtype163;
+ iprot->readMapBegin(_ktype162, _vtype163, _size161);
+ uint32_t _i165;
+ for (_i165 = 0; _i165 < _size161; ++_i165)
{
- std::string _key160;
- xfer += iprot->readString(_key160);
- std::string& _val161 = this->properties[_key160];
- xfer += iprot->readString(_val161);
+ std::string _key166;
+ xfer += iprot->readString(_key166);
+ std::string& _val167 = this->properties[_key166];
+ xfer += iprot->readString(_val167);
}
iprot->readMapEnd();
}
@@ -2249,11 +2360,11 @@ uint32_t EnvironmentContext::write(::apa
xfer += oprot->writeFieldBegin("properties", ::apache::thrift::protocol::T_MAP, 1);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->properties.size()));
- std::map<std::string, std::string> ::const_iterator _iter162;
- for (_iter162 = this->properties.begin(); _iter162 != this->properties.end(); ++_iter162)
+ std::map<std::string, std::string> ::const_iterator _iter168;
+ for (_iter168 = this->properties.begin(); _iter168 != this->properties.end(); ++_iter168)
{
- xfer += oprot->writeString(_iter162->first);
- xfer += oprot->writeString(_iter162->second);
+ xfer += oprot->writeString(_iter168->first);
+ xfer += oprot->writeString(_iter168->second);
}
xfer += oprot->writeMapEnd();
}
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=1345318&r1=1345317&r2=1345318&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 Fri Jun 1 19:35:49 2012
@@ -887,8 +887,57 @@ class StorageDescriptor {
};
+typedef struct _TableIdentifier__isset {
+ _TableIdentifier__isset() : dbName(false), tableName(false) {}
+ bool dbName;
+ bool tableName;
+} _TableIdentifier__isset;
+
+class TableIdentifier {
+ public:
+
+ static const char* ascii_fingerprint; // = "07A9615F837F7D0A952B595DD3020972";
+ static const uint8_t binary_fingerprint[16]; // = {0x07,0xA9,0x61,0x5F,0x83,0x7F,0x7D,0x0A,0x95,0x2B,0x59,0x5D,0xD3,0x02,0x09,0x72};
+
+ TableIdentifier() : dbName(""), tableName("") {
+ }
+
+ virtual ~TableIdentifier() throw() {}
+
+ std::string dbName;
+ std::string tableName;
+
+ _TableIdentifier__isset __isset;
+
+ void __set_dbName(const std::string& val) {
+ dbName = val;
+ }
+
+ void __set_tableName(const std::string& val) {
+ tableName = val;
+ }
+
+ bool operator == (const TableIdentifier & rhs) const
+ {
+ if (!(dbName == rhs.dbName))
+ return false;
+ if (!(tableName == rhs.tableName))
+ return false;
+ return true;
+ }
+ bool operator != (const TableIdentifier &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const TableIdentifier & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
typedef struct _Table__isset {
- _Table__isset() : tableName(false), dbName(false), owner(false), createTime(false), lastAccessTime(false), retention(false), sd(false), partitionKeys(false), parameters(false), viewOriginalText(false), viewExpandedText(false), tableType(false), privileges(false) {}
+ _Table__isset() : tableName(false), dbName(false), owner(false), createTime(false), lastAccessTime(false), retention(false), sd(false), partitionKeys(false), parameters(false), viewOriginalText(false), viewExpandedText(false), tableType(false), privileges(false), linkTarget(false), linkTables(false) {}
bool tableName;
bool dbName;
bool owner;
@@ -902,13 +951,15 @@ typedef struct _Table__isset {
bool viewExpandedText;
bool tableType;
bool privileges;
+ bool linkTarget;
+ bool linkTables;
} _Table__isset;
class Table {
public:
- static const char* ascii_fingerprint; // = "26BE788C09746068A2616712C9262900";
- static const uint8_t binary_fingerprint[16]; // = {0x26,0xBE,0x78,0x8C,0x09,0x74,0x60,0x68,0xA2,0x61,0x67,0x12,0xC9,0x26,0x29,0x00};
+ static const char* ascii_fingerprint; // = "06C17A4A74B309FF2357999371777D0D";
+ static const uint8_t binary_fingerprint[16]; // = {0x06,0xC1,0x7A,0x4A,0x74,0xB3,0x09,0xFF,0x23,0x57,0x99,0x93,0x71,0x77,0x7D,0x0D};
Table() : tableName(""), dbName(""), owner(""), createTime(0), lastAccessTime(0), retention(0), viewOriginalText(""), viewExpandedText(""), tableType("") {
}
@@ -928,6 +979,8 @@ class Table {
std::string viewExpandedText;
std::string tableType;
PrincipalPrivilegeSet privileges;
+ TableIdentifier linkTarget;
+ std::vector<TableIdentifier> linkTables;
_Table__isset __isset;
@@ -984,6 +1037,16 @@ class Table {
__isset.privileges = true;
}
+ void __set_linkTarget(const TableIdentifier& val) {
+ linkTarget = val;
+ __isset.linkTarget = true;
+ }
+
+ void __set_linkTables(const std::vector<TableIdentifier> & val) {
+ linkTables = val;
+ __isset.linkTables = true;
+ }
+
bool operator == (const Table & rhs) const
{
if (!(tableName == rhs.tableName))
@@ -1014,6 +1077,14 @@ class Table {
return false;
else if (__isset.privileges && !(privileges == rhs.privileges))
return false;
+ if (__isset.linkTarget != rhs.__isset.linkTarget)
+ return false;
+ else if (__isset.linkTarget && !(linkTarget == rhs.linkTarget))
+ return false;
+ if (__isset.linkTables != rhs.__isset.linkTables)
+ return false;
+ else if (__isset.linkTables && !(linkTables == rhs.linkTables))
+ return false;
return true;
}
bool operator != (const Table &rhs) const {
Modified: hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EnvironmentContext.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EnvironmentContext.java?rev=1345318&r1=1345317&r2=1345318&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EnvironmentContext.java (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EnvironmentContext.java Fri Jun 1 19:35:49 2012
@@ -275,15 +275,15 @@ public class EnvironmentContext implemen
case 1: // PROPERTIES
if (field.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map98 = iprot.readMapBegin();
- this.properties = new HashMap<String,String>(2*_map98.size);
- for (int _i99 = 0; _i99 < _map98.size; ++_i99)
+ org.apache.thrift.protocol.TMap _map102 = iprot.readMapBegin();
+ this.properties = new HashMap<String,String>(2*_map102.size);
+ for (int _i103 = 0; _i103 < _map102.size; ++_i103)
{
- String _key100; // required
- String _val101; // required
- _key100 = iprot.readString();
- _val101 = iprot.readString();
- this.properties.put(_key100, _val101);
+ String _key104; // required
+ String _val105; // required
+ _key104 = iprot.readString();
+ _val105 = iprot.readString();
+ this.properties.put(_key104, _val105);
}
iprot.readMapEnd();
}
@@ -308,10 +308,10 @@ public class EnvironmentContext implemen
oprot.writeFieldBegin(PROPERTIES_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.properties.size()));
- for (Map.Entry<String, String> _iter102 : this.properties.entrySet())
+ for (Map.Entry<String, String> _iter106 : this.properties.entrySet())
{
- oprot.writeString(_iter102.getKey());
- oprot.writeString(_iter102.getValue());
+ oprot.writeString(_iter106.getKey());
+ oprot.writeString(_iter106.getValue());
}
oprot.writeMapEnd();
}
Modified: hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Index.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Index.java?rev=1345318&r1=1345317&r2=1345318&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Index.java (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Index.java Fri Jun 1 19:35:49 2012
@@ -949,15 +949,15 @@ public class Index implements org.apache
case 9: // PARAMETERS
if (field.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map84 = iprot.readMapBegin();
- this.parameters = new HashMap<String,String>(2*_map84.size);
- for (int _i85 = 0; _i85 < _map84.size; ++_i85)
+ org.apache.thrift.protocol.TMap _map88 = iprot.readMapBegin();
+ this.parameters = new HashMap<String,String>(2*_map88.size);
+ for (int _i89 = 0; _i89 < _map88.size; ++_i89)
{
- String _key86; // required
- String _val87; // required
- _key86 = iprot.readString();
- _val87 = iprot.readString();
- this.parameters.put(_key86, _val87);
+ String _key90; // required
+ String _val91; // required
+ _key90 = iprot.readString();
+ _val91 = iprot.readString();
+ this.parameters.put(_key90, _val91);
}
iprot.readMapEnd();
}
@@ -1026,10 +1026,10 @@ public class Index implements org.apache
oprot.writeFieldBegin(PARAMETERS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.parameters.size()));
- for (Map.Entry<String, String> _iter88 : this.parameters.entrySet())
+ for (Map.Entry<String, String> _iter92 : this.parameters.entrySet())
{
- oprot.writeString(_iter88.getKey());
- oprot.writeString(_iter88.getValue());
+ oprot.writeString(_iter92.getKey());
+ oprot.writeString(_iter92.getValue());
}
oprot.writeMapEnd();
}
Modified: hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java?rev=1345318&r1=1345317&r2=1345318&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java Fri Jun 1 19:35:49 2012
@@ -772,13 +772,13 @@ public class Partition implements org.ap
case 1: // VALUES
if (field.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list75 = iprot.readListBegin();
- this.values = new ArrayList<String>(_list75.size);
- for (int _i76 = 0; _i76 < _list75.size; ++_i76)
+ org.apache.thrift.protocol.TList _list79 = iprot.readListBegin();
+ this.values = new ArrayList<String>(_list79.size);
+ for (int _i80 = 0; _i80 < _list79.size; ++_i80)
{
- String _elem77; // required
- _elem77 = iprot.readString();
- this.values.add(_elem77);
+ String _elem81; // required
+ _elem81 = iprot.readString();
+ this.values.add(_elem81);
}
iprot.readListEnd();
}
@@ -827,15 +827,15 @@ public class Partition implements org.ap
case 7: // PARAMETERS
if (field.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map78 = iprot.readMapBegin();
- this.parameters = new HashMap<String,String>(2*_map78.size);
- for (int _i79 = 0; _i79 < _map78.size; ++_i79)
+ org.apache.thrift.protocol.TMap _map82 = iprot.readMapBegin();
+ this.parameters = new HashMap<String,String>(2*_map82.size);
+ for (int _i83 = 0; _i83 < _map82.size; ++_i83)
{
- String _key80; // required
- String _val81; // required
- _key80 = iprot.readString();
- _val81 = iprot.readString();
- this.parameters.put(_key80, _val81);
+ String _key84; // required
+ String _val85; // required
+ _key84 = iprot.readString();
+ _val85 = iprot.readString();
+ this.parameters.put(_key84, _val85);
}
iprot.readMapEnd();
}
@@ -868,9 +868,9 @@ public class Partition implements org.ap
oprot.writeFieldBegin(VALUES_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.values.size()));
- for (String _iter82 : this.values)
+ for (String _iter86 : this.values)
{
- oprot.writeString(_iter82);
+ oprot.writeString(_iter86);
}
oprot.writeListEnd();
}
@@ -901,10 +901,10 @@ public class Partition implements org.ap
oprot.writeFieldBegin(PARAMETERS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.parameters.size()));
- for (Map.Entry<String, String> _iter83 : this.parameters.entrySet())
+ for (Map.Entry<String, String> _iter87 : this.parameters.entrySet())
{
- oprot.writeString(_iter83.getKey());
- oprot.writeString(_iter83.getValue());
+ oprot.writeString(_iter87.getKey());
+ oprot.writeString(_iter87.getValue());
}
oprot.writeMapEnd();
}
Modified: hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Schema.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Schema.java?rev=1345318&r1=1345317&r2=1345318&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Schema.java (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Schema.java Fri Jun 1 19:35:49 2012
@@ -363,14 +363,14 @@ public class Schema implements org.apach
case 1: // FIELD_SCHEMAS
if (field.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list89 = iprot.readListBegin();
- this.fieldSchemas = new ArrayList<FieldSchema>(_list89.size);
- for (int _i90 = 0; _i90 < _list89.size; ++_i90)
+ org.apache.thrift.protocol.TList _list93 = iprot.readListBegin();
+ this.fieldSchemas = new ArrayList<FieldSchema>(_list93.size);
+ for (int _i94 = 0; _i94 < _list93.size; ++_i94)
{
- FieldSchema _elem91; // required
- _elem91 = new FieldSchema();
- _elem91.read(iprot);
- this.fieldSchemas.add(_elem91);
+ FieldSchema _elem95; // required
+ _elem95 = new FieldSchema();
+ _elem95.read(iprot);
+ this.fieldSchemas.add(_elem95);
}
iprot.readListEnd();
}
@@ -381,15 +381,15 @@ public class Schema implements org.apach
case 2: // PROPERTIES
if (field.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map92 = iprot.readMapBegin();
- this.properties = new HashMap<String,String>(2*_map92.size);
- for (int _i93 = 0; _i93 < _map92.size; ++_i93)
+ org.apache.thrift.protocol.TMap _map96 = iprot.readMapBegin();
+ this.properties = new HashMap<String,String>(2*_map96.size);
+ for (int _i97 = 0; _i97 < _map96.size; ++_i97)
{
- String _key94; // required
- String _val95; // required
- _key94 = iprot.readString();
- _val95 = iprot.readString();
- this.properties.put(_key94, _val95);
+ String _key98; // required
+ String _val99; // required
+ _key98 = iprot.readString();
+ _val99 = iprot.readString();
+ this.properties.put(_key98, _val99);
}
iprot.readMapEnd();
}
@@ -414,9 +414,9 @@ public class Schema implements org.apach
oprot.writeFieldBegin(FIELD_SCHEMAS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.fieldSchemas.size()));
- for (FieldSchema _iter96 : this.fieldSchemas)
+ for (FieldSchema _iter100 : this.fieldSchemas)
{
- _iter96.write(oprot);
+ _iter100.write(oprot);
}
oprot.writeListEnd();
}
@@ -426,10 +426,10 @@ public class Schema implements org.apach
oprot.writeFieldBegin(PROPERTIES_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.properties.size()));
- for (Map.Entry<String, String> _iter97 : this.properties.entrySet())
+ for (Map.Entry<String, String> _iter101 : this.properties.entrySet())
{
- oprot.writeString(_iter97.getKey());
- oprot.writeString(_iter97.getValue());
+ oprot.writeString(_iter101.getKey());
+ oprot.writeString(_iter101.getValue());
}
oprot.writeMapEnd();
}
Modified: hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java?rev=1345318&r1=1345317&r2=1345318&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java Fri Jun 1 19:35:49 2012
@@ -36,6 +36,8 @@ public class Table implements org.apache
private static final org.apache.thrift.protocol.TField VIEW_EXPANDED_TEXT_FIELD_DESC = new org.apache.thrift.protocol.TField("viewExpandedText", org.apache.thrift.protocol.TType.STRING, (short)11);
private static final org.apache.thrift.protocol.TField TABLE_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tableType", org.apache.thrift.protocol.TType.STRING, (short)12);
private static final org.apache.thrift.protocol.TField PRIVILEGES_FIELD_DESC = new org.apache.thrift.protocol.TField("privileges", org.apache.thrift.protocol.TType.STRUCT, (short)13);
+ private static final org.apache.thrift.protocol.TField LINK_TARGET_FIELD_DESC = new org.apache.thrift.protocol.TField("linkTarget", org.apache.thrift.protocol.TType.STRUCT, (short)14);
+ private static final org.apache.thrift.protocol.TField LINK_TABLES_FIELD_DESC = new org.apache.thrift.protocol.TField("linkTables", org.apache.thrift.protocol.TType.LIST, (short)15);
private String tableName; // required
private String dbName; // required
@@ -50,6 +52,8 @@ public class Table implements org.apache
private String viewExpandedText; // required
private String tableType; // required
private PrincipalPrivilegeSet privileges; // required
+ private TableIdentifier linkTarget; // required
+ private List<TableIdentifier> linkTables; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -65,7 +69,9 @@ public class Table implements org.apache
VIEW_ORIGINAL_TEXT((short)10, "viewOriginalText"),
VIEW_EXPANDED_TEXT((short)11, "viewExpandedText"),
TABLE_TYPE((short)12, "tableType"),
- PRIVILEGES((short)13, "privileges");
+ PRIVILEGES((short)13, "privileges"),
+ LINK_TARGET((short)14, "linkTarget"),
+ LINK_TABLES((short)15, "linkTables");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -106,6 +112,10 @@ public class Table implements org.apache
return TABLE_TYPE;
case 13: // PRIVILEGES
return PRIVILEGES;
+ case 14: // LINK_TARGET
+ return LINK_TARGET;
+ case 15: // LINK_TABLES
+ return LINK_TABLES;
default:
return null;
}
@@ -183,6 +193,11 @@ public class Table implements org.apache
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.PRIVILEGES, new org.apache.thrift.meta_data.FieldMetaData("privileges", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, PrincipalPrivilegeSet.class)));
+ tmpMap.put(_Fields.LINK_TARGET, new org.apache.thrift.meta_data.FieldMetaData("linkTarget", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TableIdentifier.class)));
+ tmpMap.put(_Fields.LINK_TABLES, new org.apache.thrift.meta_data.FieldMetaData("linkTables", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TableIdentifier.class))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Table.class, metaDataMap);
}
@@ -277,6 +292,16 @@ public class Table implements org.apache
if (other.isSetPrivileges()) {
this.privileges = new PrincipalPrivilegeSet(other.privileges);
}
+ if (other.isSetLinkTarget()) {
+ this.linkTarget = new TableIdentifier(other.linkTarget);
+ }
+ if (other.isSetLinkTables()) {
+ List<TableIdentifier> __this__linkTables = new ArrayList<TableIdentifier>();
+ for (TableIdentifier other_element : other.linkTables) {
+ __this__linkTables.add(new TableIdentifier(other_element));
+ }
+ this.linkTables = __this__linkTables;
+ }
}
public Table deepCopy() {
@@ -301,6 +326,8 @@ public class Table implements org.apache
this.viewExpandedText = null;
this.tableType = null;
this.privileges = null;
+ this.linkTarget = null;
+ this.linkTables = null;
}
public String getTableName() {
@@ -625,6 +652,67 @@ public class Table implements org.apache
}
}
+ public TableIdentifier getLinkTarget() {
+ return this.linkTarget;
+ }
+
+ public void setLinkTarget(TableIdentifier linkTarget) {
+ this.linkTarget = linkTarget;
+ }
+
+ public void unsetLinkTarget() {
+ this.linkTarget = null;
+ }
+
+ /** Returns true if field linkTarget is set (has been assigned a value) and false otherwise */
+ public boolean isSetLinkTarget() {
+ return this.linkTarget != null;
+ }
+
+ public void setLinkTargetIsSet(boolean value) {
+ if (!value) {
+ this.linkTarget = null;
+ }
+ }
+
+ public int getLinkTablesSize() {
+ return (this.linkTables == null) ? 0 : this.linkTables.size();
+ }
+
+ public java.util.Iterator<TableIdentifier> getLinkTablesIterator() {
+ return (this.linkTables == null) ? null : this.linkTables.iterator();
+ }
+
+ public void addToLinkTables(TableIdentifier elem) {
+ if (this.linkTables == null) {
+ this.linkTables = new ArrayList<TableIdentifier>();
+ }
+ this.linkTables.add(elem);
+ }
+
+ public List<TableIdentifier> getLinkTables() {
+ return this.linkTables;
+ }
+
+ public void setLinkTables(List<TableIdentifier> linkTables) {
+ this.linkTables = linkTables;
+ }
+
+ public void unsetLinkTables() {
+ this.linkTables = null;
+ }
+
+ /** Returns true if field linkTables is set (has been assigned a value) and false otherwise */
+ public boolean isSetLinkTables() {
+ return this.linkTables != null;
+ }
+
+ public void setLinkTablesIsSet(boolean value) {
+ if (!value) {
+ this.linkTables = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case TABLE_NAME:
@@ -731,6 +819,22 @@ public class Table implements org.apache
}
break;
+ case LINK_TARGET:
+ if (value == null) {
+ unsetLinkTarget();
+ } else {
+ setLinkTarget((TableIdentifier)value);
+ }
+ break;
+
+ case LINK_TABLES:
+ if (value == null) {
+ unsetLinkTables();
+ } else {
+ setLinkTables((List<TableIdentifier>)value);
+ }
+ break;
+
}
}
@@ -775,6 +879,12 @@ public class Table implements org.apache
case PRIVILEGES:
return getPrivileges();
+ case LINK_TARGET:
+ return getLinkTarget();
+
+ case LINK_TABLES:
+ return getLinkTables();
+
}
throw new IllegalStateException();
}
@@ -812,6 +922,10 @@ public class Table implements org.apache
return isSetTableType();
case PRIVILEGES:
return isSetPrivileges();
+ case LINK_TARGET:
+ return isSetLinkTarget();
+ case LINK_TABLES:
+ return isSetLinkTables();
}
throw new IllegalStateException();
}
@@ -946,6 +1060,24 @@ public class Table implements org.apache
return false;
}
+ boolean this_present_linkTarget = true && this.isSetLinkTarget();
+ boolean that_present_linkTarget = true && that.isSetLinkTarget();
+ if (this_present_linkTarget || that_present_linkTarget) {
+ if (!(this_present_linkTarget && that_present_linkTarget))
+ return false;
+ if (!this.linkTarget.equals(that.linkTarget))
+ return false;
+ }
+
+ boolean this_present_linkTables = true && this.isSetLinkTables();
+ boolean that_present_linkTables = true && that.isSetLinkTables();
+ if (this_present_linkTables || that_present_linkTables) {
+ if (!(this_present_linkTables && that_present_linkTables))
+ return false;
+ if (!this.linkTables.equals(that.linkTables))
+ return false;
+ }
+
return true;
}
@@ -1092,6 +1224,26 @@ public class Table implements org.apache
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetLinkTarget()).compareTo(typedOther.isSetLinkTarget());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetLinkTarget()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.linkTarget, typedOther.linkTarget);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetLinkTables()).compareTo(typedOther.isSetLinkTables());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetLinkTables()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.linkTables, typedOther.linkTables);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -1228,6 +1380,32 @@ public class Table implements org.apache
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
+ case 14: // LINK_TARGET
+ if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+ this.linkTarget = new TableIdentifier();
+ this.linkTarget.read(iprot);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case 15: // LINK_TABLES
+ if (field.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list73 = iprot.readListBegin();
+ this.linkTables = new ArrayList<TableIdentifier>(_list73.size);
+ for (int _i74 = 0; _i74 < _list73.size; ++_i74)
+ {
+ TableIdentifier _elem75; // required
+ _elem75 = new TableIdentifier();
+ _elem75.read(iprot);
+ this.linkTables.add(_elem75);
+ }
+ iprot.readListEnd();
+ }
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
@@ -1274,9 +1452,9 @@ public class Table implements org.apache
oprot.writeFieldBegin(PARTITION_KEYS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.partitionKeys.size()));
- for (FieldSchema _iter73 : this.partitionKeys)
+ for (FieldSchema _iter76 : this.partitionKeys)
{
- _iter73.write(oprot);
+ _iter76.write(oprot);
}
oprot.writeListEnd();
}
@@ -1286,10 +1464,10 @@ public class Table implements org.apache
oprot.writeFieldBegin(PARAMETERS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.parameters.size()));
- for (Map.Entry<String, String> _iter74 : this.parameters.entrySet())
+ for (Map.Entry<String, String> _iter77 : this.parameters.entrySet())
{
- oprot.writeString(_iter74.getKey());
- oprot.writeString(_iter74.getValue());
+ oprot.writeString(_iter77.getKey());
+ oprot.writeString(_iter77.getValue());
}
oprot.writeMapEnd();
}
@@ -1317,6 +1495,27 @@ public class Table implements org.apache
oprot.writeFieldEnd();
}
}
+ if (this.linkTarget != null) {
+ if (isSetLinkTarget()) {
+ oprot.writeFieldBegin(LINK_TARGET_FIELD_DESC);
+ this.linkTarget.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (this.linkTables != null) {
+ if (isSetLinkTables()) {
+ oprot.writeFieldBegin(LINK_TABLES_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.linkTables.size()));
+ for (TableIdentifier _iter78 : this.linkTables)
+ {
+ _iter78.write(oprot);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -1419,6 +1618,26 @@ public class Table implements org.apache
}
first = false;
}
+ if (isSetLinkTarget()) {
+ if (!first) sb.append(", ");
+ sb.append("linkTarget:");
+ if (this.linkTarget == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.linkTarget);
+ }
+ first = false;
+ }
+ if (isSetLinkTables()) {
+ if (!first) sb.append(", ");
+ sb.append("linkTables:");
+ if (this.linkTables == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.linkTables);
+ }
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
Added: hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableIdentifier.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableIdentifier.java?rev=1345318&view=auto
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableIdentifier.java (added)
+++ hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableIdentifier.java Fri Jun 1 19:35:49 2012
@@ -0,0 +1,404 @@
+/**
+ * Autogenerated by Thrift Compiler (0.7.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.hadoop.hive.metastore.api;
+
+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 TableIdentifier implements org.apache.thrift.TBase<TableIdentifier, TableIdentifier._Fields>, java.io.Serializable, Cloneable {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TableIdentifier");
+
+ 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)1);
+ 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)2);
+
+ private String dbName; // required
+ private String tableName; // required
+
+ /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ DB_NAME((short)1, "dbName"),
+ TABLE_NAME((short)2, "tableName");
+
+ 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: // DB_NAME
+ return DB_NAME;
+ case 2: // TABLE_NAME
+ return TABLE_NAME;
+ 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;
+ }
+ }
+
+ // isset id assignments
+
+ 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.DB_NAME, new org.apache.thrift.meta_data.FieldMetaData("dbName", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ 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.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TableIdentifier.class, metaDataMap);
+ }
+
+ public TableIdentifier() {
+ }
+
+ public TableIdentifier(
+ String dbName,
+ String tableName)
+ {
+ this();
+ this.dbName = dbName;
+ this.tableName = tableName;
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public TableIdentifier(TableIdentifier other) {
+ if (other.isSetDbName()) {
+ this.dbName = other.dbName;
+ }
+ if (other.isSetTableName()) {
+ this.tableName = other.tableName;
+ }
+ }
+
+ public TableIdentifier deepCopy() {
+ return new TableIdentifier(this);
+ }
+
+ @Override
+ public void clear() {
+ this.dbName = null;
+ this.tableName = null;
+ }
+
+ public String getDbName() {
+ return this.dbName;
+ }
+
+ public void setDbName(String dbName) {
+ this.dbName = dbName;
+ }
+
+ public void unsetDbName() {
+ this.dbName = null;
+ }
+
+ /** Returns true if field dbName is set (has been assigned a value) and false otherwise */
+ public boolean isSetDbName() {
+ return this.dbName != null;
+ }
+
+ public void setDbNameIsSet(boolean value) {
+ if (!value) {
+ this.dbName = null;
+ }
+ }
+
+ public String getTableName() {
+ return this.tableName;
+ }
+
+ public void setTableName(String tableName) {
+ this.tableName = tableName;
+ }
+
+ public void unsetTableName() {
+ this.tableName = null;
+ }
+
+ /** Returns true if field tableName is set (has been assigned a value) and false otherwise */
+ public boolean isSetTableName() {
+ return this.tableName != null;
+ }
+
+ public void setTableNameIsSet(boolean value) {
+ if (!value) {
+ this.tableName = null;
+ }
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case DB_NAME:
+ if (value == null) {
+ unsetDbName();
+ } else {
+ setDbName((String)value);
+ }
+ break;
+
+ case TABLE_NAME:
+ if (value == null) {
+ unsetTableName();
+ } else {
+ setTableName((String)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case DB_NAME:
+ return getDbName();
+
+ case TABLE_NAME:
+ return getTableName();
+
+ }
+ 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) {
+ case DB_NAME:
+ return isSetDbName();
+ case TABLE_NAME:
+ return isSetTableName();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof TableIdentifier)
+ return this.equals((TableIdentifier)that);
+ return false;
+ }
+
+ public boolean equals(TableIdentifier that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_dbName = true && this.isSetDbName();
+ boolean that_present_dbName = true && that.isSetDbName();
+ if (this_present_dbName || that_present_dbName) {
+ if (!(this_present_dbName && that_present_dbName))
+ return false;
+ if (!this.dbName.equals(that.dbName))
+ return false;
+ }
+
+ boolean this_present_tableName = true && this.isSetTableName();
+ boolean that_present_tableName = true && that.isSetTableName();
+ if (this_present_tableName || that_present_tableName) {
+ if (!(this_present_tableName && that_present_tableName))
+ return false;
+ if (!this.tableName.equals(that.tableName))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return 0;
+ }
+
+ public int compareTo(TableIdentifier other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
+ TableIdentifier typedOther = (TableIdentifier)other;
+
+ lastComparison = Boolean.valueOf(isSetDbName()).compareTo(typedOther.isSetDbName());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetDbName()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dbName, typedOther.dbName);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetTableName()).compareTo(typedOther.isSetTableName());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetTableName()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ 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 {
+ org.apache.thrift.protocol.TField field;
+ iprot.readStructBegin();
+ while (true)
+ {
+ field = iprot.readFieldBegin();
+ if (field.type == org.apache.thrift.protocol.TType.STOP) {
+ break;
+ }
+ switch (field.id) {
+ case 1: // DB_NAME
+ if (field.type == org.apache.thrift.protocol.TType.STRING) {
+ this.dbName = iprot.readString();
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case 2: // TABLE_NAME
+ if (field.type == org.apache.thrift.protocol.TType.STRING) {
+ this.tableName = iprot.readString();
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+ validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (this.dbName != null) {
+ oprot.writeFieldBegin(DB_NAME_FIELD_DESC);
+ oprot.writeString(this.dbName);
+ oprot.writeFieldEnd();
+ }
+ if (this.tableName != null) {
+ oprot.writeFieldBegin(TABLE_NAME_FIELD_DESC);
+ oprot.writeString(this.tableName);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder("TableIdentifier(");
+ boolean first = true;
+
+ sb.append("dbName:");
+ if (this.dbName == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.dbName);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("tableName:");
+ if (this.tableName == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.tableName);
+ }
+ first = false;
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public void validate() throws org.apache.thrift.TException {
+ // check for required fields
+ }
+
+ 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);
+ }
+ }
+
+}
+