You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by th...@apache.org on 2014/02/17 06:31:05 UTC
svn commit: r1568880 [3/4] - in /hive/trunk:
itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/
metastore/if/ metastore/scripts/upgrade/derby/
metastore/scripts/upgrade/mysql/ metastore/scripts/upgrade/oracle/
metastore/scripts/upgrade/po...
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=1568880&r1=1568879&r2=1568880&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 Mon Feb 17 05:31:04 2014
@@ -1148,8 +1148,8 @@ void swap(Role &a, Role &b) {
swap(a.__isset, b.__isset);
}
-const char* Database::ascii_fingerprint = "213967572143E49C9F1A23F7A866E2F5";
-const uint8_t Database::binary_fingerprint[16] = {0x21,0x39,0x67,0x57,0x21,0x43,0xE4,0x9C,0x9F,0x1A,0x23,0xF7,0xA8,0x66,0xE2,0xF5};
+const char* Database::ascii_fingerprint = "553495CAE243A1C583D5C3DD990AED53";
+const uint8_t Database::binary_fingerprint[16] = {0x55,0x34,0x95,0xCA,0xE2,0x43,0xA1,0xC5,0x83,0xD5,0xC3,0xDD,0x99,0x0A,0xED,0x53};
uint32_t Database::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -1226,6 +1226,24 @@ uint32_t Database::read(::apache::thrift
xfer += iprot->skip(ftype);
}
break;
+ case 6:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->ownerName);
+ this->__isset.ownerName = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 7:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ int32_t ecast70;
+ xfer += iprot->readI32(ecast70);
+ this->ownerType = (PrincipalType::type)ecast70;
+ this->__isset.ownerType = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
default:
xfer += iprot->skip(ftype);
break;
@@ -1257,11 +1275,11 @@ uint32_t Database::write(::apache::thrif
xfer += oprot->writeFieldBegin("parameters", ::apache::thrift::protocol::T_MAP, 4);
{
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 _iter70;
- for (_iter70 = this->parameters.begin(); _iter70 != this->parameters.end(); ++_iter70)
+ std::map<std::string, std::string> ::const_iterator _iter71;
+ for (_iter71 = this->parameters.begin(); _iter71 != this->parameters.end(); ++_iter71)
{
- xfer += oprot->writeString(_iter70->first);
- xfer += oprot->writeString(_iter70->second);
+ xfer += oprot->writeString(_iter71->first);
+ xfer += oprot->writeString(_iter71->second);
}
xfer += oprot->writeMapEnd();
}
@@ -1272,6 +1290,16 @@ uint32_t Database::write(::apache::thrif
xfer += this->privileges.write(oprot);
xfer += oprot->writeFieldEnd();
}
+ if (this->__isset.ownerName) {
+ xfer += oprot->writeFieldBegin("ownerName", ::apache::thrift::protocol::T_STRING, 6);
+ xfer += oprot->writeString(this->ownerName);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.ownerType) {
+ xfer += oprot->writeFieldBegin("ownerType", ::apache::thrift::protocol::T_I32, 7);
+ xfer += oprot->writeI32((int32_t)this->ownerType);
+ xfer += oprot->writeFieldEnd();
+ }
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -1284,6 +1312,8 @@ void swap(Database &a, Database &b) {
swap(a.locationUri, b.locationUri);
swap(a.parameters, b.parameters);
swap(a.privileges, b.privileges);
+ swap(a.ownerName, b.ownerName);
+ swap(a.ownerType, b.ownerType);
swap(a.__isset, b.__isset);
}
@@ -1330,17 +1360,17 @@ uint32_t SerDeInfo::read(::apache::thrif
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->parameters.clear();
- uint32_t _size71;
- ::apache::thrift::protocol::TType _ktype72;
- ::apache::thrift::protocol::TType _vtype73;
- xfer += iprot->readMapBegin(_ktype72, _vtype73, _size71);
- uint32_t _i75;
- for (_i75 = 0; _i75 < _size71; ++_i75)
+ uint32_t _size72;
+ ::apache::thrift::protocol::TType _ktype73;
+ ::apache::thrift::protocol::TType _vtype74;
+ xfer += iprot->readMapBegin(_ktype73, _vtype74, _size72);
+ uint32_t _i76;
+ for (_i76 = 0; _i76 < _size72; ++_i76)
{
- std::string _key76;
- xfer += iprot->readString(_key76);
- std::string& _val77 = this->parameters[_key76];
- xfer += iprot->readString(_val77);
+ std::string _key77;
+ xfer += iprot->readString(_key77);
+ std::string& _val78 = this->parameters[_key77];
+ xfer += iprot->readString(_val78);
}
xfer += iprot->readMapEnd();
}
@@ -1376,11 +1406,11 @@ uint32_t SerDeInfo::write(::apache::thri
xfer += oprot->writeFieldBegin("parameters", ::apache::thrift::protocol::T_MAP, 3);
{
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 _iter78;
- for (_iter78 = this->parameters.begin(); _iter78 != this->parameters.end(); ++_iter78)
+ std::map<std::string, std::string> ::const_iterator _iter79;
+ for (_iter79 = this->parameters.begin(); _iter79 != this->parameters.end(); ++_iter79)
{
- xfer += oprot->writeString(_iter78->first);
- xfer += oprot->writeString(_iter78->second);
+ xfer += oprot->writeString(_iter79->first);
+ xfer += oprot->writeString(_iter79->second);
}
xfer += oprot->writeMapEnd();
}
@@ -1501,14 +1531,14 @@ uint32_t SkewedInfo::read(::apache::thri
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->skewedColNames.clear();
- uint32_t _size79;
- ::apache::thrift::protocol::TType _etype82;
- xfer += iprot->readListBegin(_etype82, _size79);
- this->skewedColNames.resize(_size79);
- uint32_t _i83;
- for (_i83 = 0; _i83 < _size79; ++_i83)
+ uint32_t _size80;
+ ::apache::thrift::protocol::TType _etype83;
+ xfer += iprot->readListBegin(_etype83, _size80);
+ this->skewedColNames.resize(_size80);
+ uint32_t _i84;
+ for (_i84 = 0; _i84 < _size80; ++_i84)
{
- xfer += iprot->readString(this->skewedColNames[_i83]);
+ xfer += iprot->readString(this->skewedColNames[_i84]);
}
xfer += iprot->readListEnd();
}
@@ -1521,23 +1551,23 @@ uint32_t SkewedInfo::read(::apache::thri
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->skewedColValues.clear();
- uint32_t _size84;
- ::apache::thrift::protocol::TType _etype87;
- xfer += iprot->readListBegin(_etype87, _size84);
- this->skewedColValues.resize(_size84);
- uint32_t _i88;
- for (_i88 = 0; _i88 < _size84; ++_i88)
+ uint32_t _size85;
+ ::apache::thrift::protocol::TType _etype88;
+ xfer += iprot->readListBegin(_etype88, _size85);
+ this->skewedColValues.resize(_size85);
+ uint32_t _i89;
+ for (_i89 = 0; _i89 < _size85; ++_i89)
{
{
- this->skewedColValues[_i88].clear();
- uint32_t _size89;
- ::apache::thrift::protocol::TType _etype92;
- xfer += iprot->readListBegin(_etype92, _size89);
- this->skewedColValues[_i88].resize(_size89);
- uint32_t _i93;
- for (_i93 = 0; _i93 < _size89; ++_i93)
+ this->skewedColValues[_i89].clear();
+ uint32_t _size90;
+ ::apache::thrift::protocol::TType _etype93;
+ xfer += iprot->readListBegin(_etype93, _size90);
+ this->skewedColValues[_i89].resize(_size90);
+ uint32_t _i94;
+ for (_i94 = 0; _i94 < _size90; ++_i94)
{
- xfer += iprot->readString(this->skewedColValues[_i88][_i93]);
+ xfer += iprot->readString(this->skewedColValues[_i89][_i94]);
}
xfer += iprot->readListEnd();
}
@@ -1553,29 +1583,29 @@ uint32_t SkewedInfo::read(::apache::thri
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->skewedColValueLocationMaps.clear();
- uint32_t _size94;
- ::apache::thrift::protocol::TType _ktype95;
- ::apache::thrift::protocol::TType _vtype96;
- xfer += iprot->readMapBegin(_ktype95, _vtype96, _size94);
- uint32_t _i98;
- for (_i98 = 0; _i98 < _size94; ++_i98)
+ uint32_t _size95;
+ ::apache::thrift::protocol::TType _ktype96;
+ ::apache::thrift::protocol::TType _vtype97;
+ xfer += iprot->readMapBegin(_ktype96, _vtype97, _size95);
+ uint32_t _i99;
+ for (_i99 = 0; _i99 < _size95; ++_i99)
{
- std::vector<std::string> _key99;
+ std::vector<std::string> _key100;
{
- _key99.clear();
- uint32_t _size101;
- ::apache::thrift::protocol::TType _etype104;
- xfer += iprot->readListBegin(_etype104, _size101);
- _key99.resize(_size101);
- uint32_t _i105;
- for (_i105 = 0; _i105 < _size101; ++_i105)
+ _key100.clear();
+ uint32_t _size102;
+ ::apache::thrift::protocol::TType _etype105;
+ xfer += iprot->readListBegin(_etype105, _size102);
+ _key100.resize(_size102);
+ uint32_t _i106;
+ for (_i106 = 0; _i106 < _size102; ++_i106)
{
- xfer += iprot->readString(_key99[_i105]);
+ xfer += iprot->readString(_key100[_i106]);
}
xfer += iprot->readListEnd();
}
- std::string& _val100 = this->skewedColValueLocationMaps[_key99];
- xfer += iprot->readString(_val100);
+ std::string& _val101 = this->skewedColValueLocationMaps[_key100];
+ xfer += iprot->readString(_val101);
}
xfer += iprot->readMapEnd();
}
@@ -1603,10 +1633,10 @@ uint32_t SkewedInfo::write(::apache::thr
xfer += oprot->writeFieldBegin("skewedColNames", ::apache::thrift::protocol::T_LIST, 1);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->skewedColNames.size()));
- std::vector<std::string> ::const_iterator _iter106;
- for (_iter106 = this->skewedColNames.begin(); _iter106 != this->skewedColNames.end(); ++_iter106)
+ std::vector<std::string> ::const_iterator _iter107;
+ for (_iter107 = this->skewedColNames.begin(); _iter107 != this->skewedColNames.end(); ++_iter107)
{
- xfer += oprot->writeString((*_iter106));
+ xfer += oprot->writeString((*_iter107));
}
xfer += oprot->writeListEnd();
}
@@ -1615,15 +1645,15 @@ uint32_t SkewedInfo::write(::apache::thr
xfer += oprot->writeFieldBegin("skewedColValues", ::apache::thrift::protocol::T_LIST, 2);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_LIST, static_cast<uint32_t>(this->skewedColValues.size()));
- std::vector<std::vector<std::string> > ::const_iterator _iter107;
- for (_iter107 = this->skewedColValues.begin(); _iter107 != this->skewedColValues.end(); ++_iter107)
+ std::vector<std::vector<std::string> > ::const_iterator _iter108;
+ for (_iter108 = this->skewedColValues.begin(); _iter108 != this->skewedColValues.end(); ++_iter108)
{
{
- xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>((*_iter107).size()));
- std::vector<std::string> ::const_iterator _iter108;
- for (_iter108 = (*_iter107).begin(); _iter108 != (*_iter107).end(); ++_iter108)
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>((*_iter108).size()));
+ std::vector<std::string> ::const_iterator _iter109;
+ for (_iter109 = (*_iter108).begin(); _iter109 != (*_iter108).end(); ++_iter109)
{
- xfer += oprot->writeString((*_iter108));
+ xfer += oprot->writeString((*_iter109));
}
xfer += oprot->writeListEnd();
}
@@ -1635,19 +1665,19 @@ uint32_t SkewedInfo::write(::apache::thr
xfer += oprot->writeFieldBegin("skewedColValueLocationMaps", ::apache::thrift::protocol::T_MAP, 3);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_LIST, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->skewedColValueLocationMaps.size()));
- std::map<std::vector<std::string> , std::string> ::const_iterator _iter109;
- for (_iter109 = this->skewedColValueLocationMaps.begin(); _iter109 != this->skewedColValueLocationMaps.end(); ++_iter109)
+ std::map<std::vector<std::string> , std::string> ::const_iterator _iter110;
+ for (_iter110 = this->skewedColValueLocationMaps.begin(); _iter110 != this->skewedColValueLocationMaps.end(); ++_iter110)
{
{
- xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(_iter109->first.size()));
- std::vector<std::string> ::const_iterator _iter110;
- for (_iter110 = _iter109->first.begin(); _iter110 != _iter109->first.end(); ++_iter110)
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(_iter110->first.size()));
+ std::vector<std::string> ::const_iterator _iter111;
+ for (_iter111 = _iter110->first.begin(); _iter111 != _iter110->first.end(); ++_iter111)
{
- xfer += oprot->writeString((*_iter110));
+ xfer += oprot->writeString((*_iter111));
}
xfer += oprot->writeListEnd();
}
- xfer += oprot->writeString(_iter109->second);
+ xfer += oprot->writeString(_iter110->second);
}
xfer += oprot->writeMapEnd();
}
@@ -1693,14 +1723,14 @@ uint32_t StorageDescriptor::read(::apach
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->cols.clear();
- uint32_t _size111;
- ::apache::thrift::protocol::TType _etype114;
- xfer += iprot->readListBegin(_etype114, _size111);
- this->cols.resize(_size111);
- uint32_t _i115;
- for (_i115 = 0; _i115 < _size111; ++_i115)
+ uint32_t _size112;
+ ::apache::thrift::protocol::TType _etype115;
+ xfer += iprot->readListBegin(_etype115, _size112);
+ this->cols.resize(_size112);
+ uint32_t _i116;
+ for (_i116 = 0; _i116 < _size112; ++_i116)
{
- xfer += this->cols[_i115].read(iprot);
+ xfer += this->cols[_i116].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -1761,14 +1791,14 @@ uint32_t StorageDescriptor::read(::apach
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->bucketCols.clear();
- uint32_t _size116;
- ::apache::thrift::protocol::TType _etype119;
- xfer += iprot->readListBegin(_etype119, _size116);
- this->bucketCols.resize(_size116);
- uint32_t _i120;
- for (_i120 = 0; _i120 < _size116; ++_i120)
+ uint32_t _size117;
+ ::apache::thrift::protocol::TType _etype120;
+ xfer += iprot->readListBegin(_etype120, _size117);
+ this->bucketCols.resize(_size117);
+ uint32_t _i121;
+ for (_i121 = 0; _i121 < _size117; ++_i121)
{
- xfer += iprot->readString(this->bucketCols[_i120]);
+ xfer += iprot->readString(this->bucketCols[_i121]);
}
xfer += iprot->readListEnd();
}
@@ -1781,14 +1811,14 @@ uint32_t StorageDescriptor::read(::apach
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->sortCols.clear();
- uint32_t _size121;
- ::apache::thrift::protocol::TType _etype124;
- xfer += iprot->readListBegin(_etype124, _size121);
- this->sortCols.resize(_size121);
- uint32_t _i125;
- for (_i125 = 0; _i125 < _size121; ++_i125)
+ uint32_t _size122;
+ ::apache::thrift::protocol::TType _etype125;
+ xfer += iprot->readListBegin(_etype125, _size122);
+ this->sortCols.resize(_size122);
+ uint32_t _i126;
+ for (_i126 = 0; _i126 < _size122; ++_i126)
{
- xfer += this->sortCols[_i125].read(iprot);
+ xfer += this->sortCols[_i126].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -1801,17 +1831,17 @@ uint32_t StorageDescriptor::read(::apach
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->parameters.clear();
- uint32_t _size126;
- ::apache::thrift::protocol::TType _ktype127;
- ::apache::thrift::protocol::TType _vtype128;
- xfer += iprot->readMapBegin(_ktype127, _vtype128, _size126);
- uint32_t _i130;
- for (_i130 = 0; _i130 < _size126; ++_i130)
+ uint32_t _size127;
+ ::apache::thrift::protocol::TType _ktype128;
+ ::apache::thrift::protocol::TType _vtype129;
+ xfer += iprot->readMapBegin(_ktype128, _vtype129, _size127);
+ uint32_t _i131;
+ for (_i131 = 0; _i131 < _size127; ++_i131)
{
- std::string _key131;
- xfer += iprot->readString(_key131);
- std::string& _val132 = this->parameters[_key131];
- xfer += iprot->readString(_val132);
+ std::string _key132;
+ xfer += iprot->readString(_key132);
+ std::string& _val133 = this->parameters[_key132];
+ xfer += iprot->readString(_val133);
}
xfer += iprot->readMapEnd();
}
@@ -1855,10 +1885,10 @@ uint32_t StorageDescriptor::write(::apac
xfer += oprot->writeFieldBegin("cols", ::apache::thrift::protocol::T_LIST, 1);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->cols.size()));
- std::vector<FieldSchema> ::const_iterator _iter133;
- for (_iter133 = this->cols.begin(); _iter133 != this->cols.end(); ++_iter133)
+ std::vector<FieldSchema> ::const_iterator _iter134;
+ for (_iter134 = this->cols.begin(); _iter134 != this->cols.end(); ++_iter134)
{
- xfer += (*_iter133).write(oprot);
+ xfer += (*_iter134).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -1891,10 +1921,10 @@ uint32_t StorageDescriptor::write(::apac
xfer += oprot->writeFieldBegin("bucketCols", ::apache::thrift::protocol::T_LIST, 8);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->bucketCols.size()));
- std::vector<std::string> ::const_iterator _iter134;
- for (_iter134 = this->bucketCols.begin(); _iter134 != this->bucketCols.end(); ++_iter134)
+ std::vector<std::string> ::const_iterator _iter135;
+ for (_iter135 = this->bucketCols.begin(); _iter135 != this->bucketCols.end(); ++_iter135)
{
- xfer += oprot->writeString((*_iter134));
+ xfer += oprot->writeString((*_iter135));
}
xfer += oprot->writeListEnd();
}
@@ -1903,10 +1933,10 @@ uint32_t StorageDescriptor::write(::apac
xfer += oprot->writeFieldBegin("sortCols", ::apache::thrift::protocol::T_LIST, 9);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->sortCols.size()));
- std::vector<Order> ::const_iterator _iter135;
- for (_iter135 = this->sortCols.begin(); _iter135 != this->sortCols.end(); ++_iter135)
+ std::vector<Order> ::const_iterator _iter136;
+ for (_iter136 = this->sortCols.begin(); _iter136 != this->sortCols.end(); ++_iter136)
{
- xfer += (*_iter135).write(oprot);
+ xfer += (*_iter136).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -1915,11 +1945,11 @@ uint32_t StorageDescriptor::write(::apac
xfer += oprot->writeFieldBegin("parameters", ::apache::thrift::protocol::T_MAP, 10);
{
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 _iter136;
- for (_iter136 = this->parameters.begin(); _iter136 != this->parameters.end(); ++_iter136)
+ std::map<std::string, std::string> ::const_iterator _iter137;
+ for (_iter137 = this->parameters.begin(); _iter137 != this->parameters.end(); ++_iter137)
{
- xfer += oprot->writeString(_iter136->first);
- xfer += oprot->writeString(_iter136->second);
+ xfer += oprot->writeString(_iter137->first);
+ xfer += oprot->writeString(_iter137->second);
}
xfer += oprot->writeMapEnd();
}
@@ -2040,14 +2070,14 @@ uint32_t Table::read(::apache::thrift::p
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->partitionKeys.clear();
- uint32_t _size137;
- ::apache::thrift::protocol::TType _etype140;
- xfer += iprot->readListBegin(_etype140, _size137);
- this->partitionKeys.resize(_size137);
- uint32_t _i141;
- for (_i141 = 0; _i141 < _size137; ++_i141)
+ uint32_t _size138;
+ ::apache::thrift::protocol::TType _etype141;
+ xfer += iprot->readListBegin(_etype141, _size138);
+ this->partitionKeys.resize(_size138);
+ uint32_t _i142;
+ for (_i142 = 0; _i142 < _size138; ++_i142)
{
- xfer += this->partitionKeys[_i141].read(iprot);
+ xfer += this->partitionKeys[_i142].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -2060,17 +2090,17 @@ uint32_t Table::read(::apache::thrift::p
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->parameters.clear();
- uint32_t _size142;
- ::apache::thrift::protocol::TType _ktype143;
- ::apache::thrift::protocol::TType _vtype144;
- xfer += iprot->readMapBegin(_ktype143, _vtype144, _size142);
- uint32_t _i146;
- for (_i146 = 0; _i146 < _size142; ++_i146)
+ uint32_t _size143;
+ ::apache::thrift::protocol::TType _ktype144;
+ ::apache::thrift::protocol::TType _vtype145;
+ xfer += iprot->readMapBegin(_ktype144, _vtype145, _size143);
+ uint32_t _i147;
+ for (_i147 = 0; _i147 < _size143; ++_i147)
{
- std::string _key147;
- xfer += iprot->readString(_key147);
- std::string& _val148 = this->parameters[_key147];
- xfer += iprot->readString(_val148);
+ std::string _key148;
+ xfer += iprot->readString(_key148);
+ std::string& _val149 = this->parameters[_key148];
+ xfer += iprot->readString(_val149);
}
xfer += iprot->readMapEnd();
}
@@ -2158,10 +2188,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 _iter149;
- for (_iter149 = this->partitionKeys.begin(); _iter149 != this->partitionKeys.end(); ++_iter149)
+ std::vector<FieldSchema> ::const_iterator _iter150;
+ for (_iter150 = this->partitionKeys.begin(); _iter150 != this->partitionKeys.end(); ++_iter150)
{
- xfer += (*_iter149).write(oprot);
+ xfer += (*_iter150).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -2170,11 +2200,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 _iter150;
- for (_iter150 = this->parameters.begin(); _iter150 != this->parameters.end(); ++_iter150)
+ std::map<std::string, std::string> ::const_iterator _iter151;
+ for (_iter151 = this->parameters.begin(); _iter151 != this->parameters.end(); ++_iter151)
{
- xfer += oprot->writeString(_iter150->first);
- xfer += oprot->writeString(_iter150->second);
+ xfer += oprot->writeString(_iter151->first);
+ xfer += oprot->writeString(_iter151->second);
}
xfer += oprot->writeMapEnd();
}
@@ -2247,14 +2277,14 @@ uint32_t Partition::read(::apache::thrif
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->values.clear();
- uint32_t _size151;
- ::apache::thrift::protocol::TType _etype154;
- xfer += iprot->readListBegin(_etype154, _size151);
- this->values.resize(_size151);
- uint32_t _i155;
- for (_i155 = 0; _i155 < _size151; ++_i155)
+ uint32_t _size152;
+ ::apache::thrift::protocol::TType _etype155;
+ xfer += iprot->readListBegin(_etype155, _size152);
+ this->values.resize(_size152);
+ uint32_t _i156;
+ for (_i156 = 0; _i156 < _size152; ++_i156)
{
- xfer += iprot->readString(this->values[_i155]);
+ xfer += iprot->readString(this->values[_i156]);
}
xfer += iprot->readListEnd();
}
@@ -2307,17 +2337,17 @@ uint32_t Partition::read(::apache::thrif
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->parameters.clear();
- uint32_t _size156;
- ::apache::thrift::protocol::TType _ktype157;
- ::apache::thrift::protocol::TType _vtype158;
- xfer += iprot->readMapBegin(_ktype157, _vtype158, _size156);
- uint32_t _i160;
- for (_i160 = 0; _i160 < _size156; ++_i160)
+ uint32_t _size157;
+ ::apache::thrift::protocol::TType _ktype158;
+ ::apache::thrift::protocol::TType _vtype159;
+ xfer += iprot->readMapBegin(_ktype158, _vtype159, _size157);
+ uint32_t _i161;
+ for (_i161 = 0; _i161 < _size157; ++_i161)
{
- std::string _key161;
- xfer += iprot->readString(_key161);
- std::string& _val162 = this->parameters[_key161];
- xfer += iprot->readString(_val162);
+ std::string _key162;
+ xfer += iprot->readString(_key162);
+ std::string& _val163 = this->parameters[_key162];
+ xfer += iprot->readString(_val163);
}
xfer += iprot->readMapEnd();
}
@@ -2353,10 +2383,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 _iter163;
- for (_iter163 = this->values.begin(); _iter163 != this->values.end(); ++_iter163)
+ std::vector<std::string> ::const_iterator _iter164;
+ for (_iter164 = this->values.begin(); _iter164 != this->values.end(); ++_iter164)
{
- xfer += oprot->writeString((*_iter163));
+ xfer += oprot->writeString((*_iter164));
}
xfer += oprot->writeListEnd();
}
@@ -2385,11 +2415,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 _iter164;
- for (_iter164 = this->parameters.begin(); _iter164 != this->parameters.end(); ++_iter164)
+ std::map<std::string, std::string> ::const_iterator _iter165;
+ for (_iter165 = this->parameters.begin(); _iter165 != this->parameters.end(); ++_iter165)
{
- xfer += oprot->writeString(_iter164->first);
- xfer += oprot->writeString(_iter164->second);
+ xfer += oprot->writeString(_iter165->first);
+ xfer += oprot->writeString(_iter165->second);
}
xfer += oprot->writeMapEnd();
}
@@ -2509,17 +2539,17 @@ uint32_t Index::read(::apache::thrift::p
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->parameters.clear();
- uint32_t _size165;
- ::apache::thrift::protocol::TType _ktype166;
- ::apache::thrift::protocol::TType _vtype167;
- xfer += iprot->readMapBegin(_ktype166, _vtype167, _size165);
- uint32_t _i169;
- for (_i169 = 0; _i169 < _size165; ++_i169)
+ uint32_t _size166;
+ ::apache::thrift::protocol::TType _ktype167;
+ ::apache::thrift::protocol::TType _vtype168;
+ xfer += iprot->readMapBegin(_ktype167, _vtype168, _size166);
+ uint32_t _i170;
+ for (_i170 = 0; _i170 < _size166; ++_i170)
{
- std::string _key170;
- xfer += iprot->readString(_key170);
- std::string& _val171 = this->parameters[_key170];
- xfer += iprot->readString(_val171);
+ std::string _key171;
+ xfer += iprot->readString(_key171);
+ std::string& _val172 = this->parameters[_key171];
+ xfer += iprot->readString(_val172);
}
xfer += iprot->readMapEnd();
}
@@ -2587,11 +2617,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 _iter172;
- for (_iter172 = this->parameters.begin(); _iter172 != this->parameters.end(); ++_iter172)
+ std::map<std::string, std::string> ::const_iterator _iter173;
+ for (_iter173 = this->parameters.begin(); _iter173 != this->parameters.end(); ++_iter173)
{
- xfer += oprot->writeString(_iter172->first);
- xfer += oprot->writeString(_iter172->second);
+ xfer += oprot->writeString(_iter173->first);
+ xfer += oprot->writeString(_iter173->second);
}
xfer += oprot->writeMapEnd();
}
@@ -3521,14 +3551,14 @@ uint32_t ColumnStatistics::read(::apache
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->statsObj.clear();
- uint32_t _size173;
- ::apache::thrift::protocol::TType _etype176;
- xfer += iprot->readListBegin(_etype176, _size173);
- this->statsObj.resize(_size173);
- uint32_t _i177;
- for (_i177 = 0; _i177 < _size173; ++_i177)
+ uint32_t _size174;
+ ::apache::thrift::protocol::TType _etype177;
+ xfer += iprot->readListBegin(_etype177, _size174);
+ this->statsObj.resize(_size174);
+ uint32_t _i178;
+ for (_i178 = 0; _i178 < _size174; ++_i178)
{
- xfer += this->statsObj[_i177].read(iprot);
+ xfer += this->statsObj[_i178].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -3564,10 +3594,10 @@ uint32_t ColumnStatistics::write(::apach
xfer += oprot->writeFieldBegin("statsObj", ::apache::thrift::protocol::T_LIST, 2);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->statsObj.size()));
- std::vector<ColumnStatisticsObj> ::const_iterator _iter178;
- for (_iter178 = this->statsObj.begin(); _iter178 != this->statsObj.end(); ++_iter178)
+ std::vector<ColumnStatisticsObj> ::const_iterator _iter179;
+ for (_iter179 = this->statsObj.begin(); _iter179 != this->statsObj.end(); ++_iter179)
{
- xfer += (*_iter178).write(oprot);
+ xfer += (*_iter179).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -3611,14 +3641,14 @@ uint32_t Schema::read(::apache::thrift::
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->fieldSchemas.clear();
- uint32_t _size179;
- ::apache::thrift::protocol::TType _etype182;
- xfer += iprot->readListBegin(_etype182, _size179);
- this->fieldSchemas.resize(_size179);
- uint32_t _i183;
- for (_i183 = 0; _i183 < _size179; ++_i183)
+ uint32_t _size180;
+ ::apache::thrift::protocol::TType _etype183;
+ xfer += iprot->readListBegin(_etype183, _size180);
+ this->fieldSchemas.resize(_size180);
+ uint32_t _i184;
+ for (_i184 = 0; _i184 < _size180; ++_i184)
{
- xfer += this->fieldSchemas[_i183].read(iprot);
+ xfer += this->fieldSchemas[_i184].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -3631,17 +3661,17 @@ uint32_t Schema::read(::apache::thrift::
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->properties.clear();
- uint32_t _size184;
- ::apache::thrift::protocol::TType _ktype185;
- ::apache::thrift::protocol::TType _vtype186;
- xfer += iprot->readMapBegin(_ktype185, _vtype186, _size184);
- uint32_t _i188;
- for (_i188 = 0; _i188 < _size184; ++_i188)
+ uint32_t _size185;
+ ::apache::thrift::protocol::TType _ktype186;
+ ::apache::thrift::protocol::TType _vtype187;
+ xfer += iprot->readMapBegin(_ktype186, _vtype187, _size185);
+ uint32_t _i189;
+ for (_i189 = 0; _i189 < _size185; ++_i189)
{
- std::string _key189;
- xfer += iprot->readString(_key189);
- std::string& _val190 = this->properties[_key189];
- xfer += iprot->readString(_val190);
+ std::string _key190;
+ xfer += iprot->readString(_key190);
+ std::string& _val191 = this->properties[_key190];
+ xfer += iprot->readString(_val191);
}
xfer += iprot->readMapEnd();
}
@@ -3669,10 +3699,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 _iter191;
- for (_iter191 = this->fieldSchemas.begin(); _iter191 != this->fieldSchemas.end(); ++_iter191)
+ std::vector<FieldSchema> ::const_iterator _iter192;
+ for (_iter192 = this->fieldSchemas.begin(); _iter192 != this->fieldSchemas.end(); ++_iter192)
{
- xfer += (*_iter191).write(oprot);
+ xfer += (*_iter192).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -3681,11 +3711,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 _iter192;
- for (_iter192 = this->properties.begin(); _iter192 != this->properties.end(); ++_iter192)
+ std::map<std::string, std::string> ::const_iterator _iter193;
+ for (_iter193 = this->properties.begin(); _iter193 != this->properties.end(); ++_iter193)
{
- xfer += oprot->writeString(_iter192->first);
- xfer += oprot->writeString(_iter192->second);
+ xfer += oprot->writeString(_iter193->first);
+ xfer += oprot->writeString(_iter193->second);
}
xfer += oprot->writeMapEnd();
}
@@ -3730,17 +3760,17 @@ uint32_t EnvironmentContext::read(::apac
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->properties.clear();
- uint32_t _size193;
- ::apache::thrift::protocol::TType _ktype194;
- ::apache::thrift::protocol::TType _vtype195;
- xfer += iprot->readMapBegin(_ktype194, _vtype195, _size193);
- uint32_t _i197;
- for (_i197 = 0; _i197 < _size193; ++_i197)
+ uint32_t _size194;
+ ::apache::thrift::protocol::TType _ktype195;
+ ::apache::thrift::protocol::TType _vtype196;
+ xfer += iprot->readMapBegin(_ktype195, _vtype196, _size194);
+ uint32_t _i198;
+ for (_i198 = 0; _i198 < _size194; ++_i198)
{
- std::string _key198;
- xfer += iprot->readString(_key198);
- std::string& _val199 = this->properties[_key198];
- xfer += iprot->readString(_val199);
+ std::string _key199;
+ xfer += iprot->readString(_key199);
+ std::string& _val200 = this->properties[_key199];
+ xfer += iprot->readString(_val200);
}
xfer += iprot->readMapEnd();
}
@@ -3768,11 +3798,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 _iter200;
- for (_iter200 = this->properties.begin(); _iter200 != this->properties.end(); ++_iter200)
+ std::map<std::string, std::string> ::const_iterator _iter201;
+ for (_iter201 = this->properties.begin(); _iter201 != this->properties.end(); ++_iter201)
{
- xfer += oprot->writeString(_iter200->first);
- xfer += oprot->writeString(_iter200->second);
+ xfer += oprot->writeString(_iter201->first);
+ xfer += oprot->writeString(_iter201->second);
}
xfer += oprot->writeMapEnd();
}
@@ -3818,14 +3848,14 @@ uint32_t PartitionsByExprResult::read(::
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->partitions.clear();
- uint32_t _size201;
- ::apache::thrift::protocol::TType _etype204;
- xfer += iprot->readListBegin(_etype204, _size201);
- this->partitions.resize(_size201);
- uint32_t _i205;
- for (_i205 = 0; _i205 < _size201; ++_i205)
+ uint32_t _size202;
+ ::apache::thrift::protocol::TType _etype205;
+ xfer += iprot->readListBegin(_etype205, _size202);
+ this->partitions.resize(_size202);
+ uint32_t _i206;
+ for (_i206 = 0; _i206 < _size202; ++_i206)
{
- xfer += this->partitions[_i205].read(iprot);
+ xfer += this->partitions[_i206].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -3865,10 +3895,10 @@ uint32_t PartitionsByExprResult::write(:
xfer += oprot->writeFieldBegin("partitions", ::apache::thrift::protocol::T_LIST, 1);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->partitions.size()));
- std::vector<Partition> ::const_iterator _iter206;
- for (_iter206 = this->partitions.begin(); _iter206 != this->partitions.end(); ++_iter206)
+ std::vector<Partition> ::const_iterator _iter207;
+ for (_iter207 = this->partitions.begin(); _iter207 != this->partitions.end(); ++_iter207)
{
- xfer += (*_iter206).write(oprot);
+ xfer += (*_iter207).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -4042,14 +4072,14 @@ uint32_t TableStatsResult::read(::apache
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->tableStats.clear();
- uint32_t _size207;
- ::apache::thrift::protocol::TType _etype210;
- xfer += iprot->readListBegin(_etype210, _size207);
- this->tableStats.resize(_size207);
- uint32_t _i211;
- for (_i211 = 0; _i211 < _size207; ++_i211)
+ uint32_t _size208;
+ ::apache::thrift::protocol::TType _etype211;
+ xfer += iprot->readListBegin(_etype211, _size208);
+ this->tableStats.resize(_size208);
+ uint32_t _i212;
+ for (_i212 = 0; _i212 < _size208; ++_i212)
{
- xfer += this->tableStats[_i211].read(iprot);
+ xfer += this->tableStats[_i212].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -4079,10 +4109,10 @@ uint32_t TableStatsResult::write(::apach
xfer += oprot->writeFieldBegin("tableStats", ::apache::thrift::protocol::T_LIST, 1);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->tableStats.size()));
- std::vector<ColumnStatisticsObj> ::const_iterator _iter212;
- for (_iter212 = this->tableStats.begin(); _iter212 != this->tableStats.end(); ++_iter212)
+ std::vector<ColumnStatisticsObj> ::const_iterator _iter213;
+ for (_iter213 = this->tableStats.begin(); _iter213 != this->tableStats.end(); ++_iter213)
{
- xfer += (*_iter212).write(oprot);
+ xfer += (*_iter213).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -4126,26 +4156,26 @@ uint32_t PartitionsStatsResult::read(::a
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->partStats.clear();
- uint32_t _size213;
- ::apache::thrift::protocol::TType _ktype214;
- ::apache::thrift::protocol::TType _vtype215;
- xfer += iprot->readMapBegin(_ktype214, _vtype215, _size213);
- uint32_t _i217;
- for (_i217 = 0; _i217 < _size213; ++_i217)
+ uint32_t _size214;
+ ::apache::thrift::protocol::TType _ktype215;
+ ::apache::thrift::protocol::TType _vtype216;
+ xfer += iprot->readMapBegin(_ktype215, _vtype216, _size214);
+ uint32_t _i218;
+ for (_i218 = 0; _i218 < _size214; ++_i218)
{
- std::string _key218;
- xfer += iprot->readString(_key218);
- std::vector<ColumnStatisticsObj> & _val219 = this->partStats[_key218];
+ std::string _key219;
+ xfer += iprot->readString(_key219);
+ std::vector<ColumnStatisticsObj> & _val220 = this->partStats[_key219];
{
- _val219.clear();
- uint32_t _size220;
- ::apache::thrift::protocol::TType _etype223;
- xfer += iprot->readListBegin(_etype223, _size220);
- _val219.resize(_size220);
- uint32_t _i224;
- for (_i224 = 0; _i224 < _size220; ++_i224)
+ _val220.clear();
+ uint32_t _size221;
+ ::apache::thrift::protocol::TType _etype224;
+ xfer += iprot->readListBegin(_etype224, _size221);
+ _val220.resize(_size221);
+ uint32_t _i225;
+ for (_i225 = 0; _i225 < _size221; ++_i225)
{
- xfer += _val219[_i224].read(iprot);
+ xfer += _val220[_i225].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -4178,16 +4208,16 @@ uint32_t PartitionsStatsResult::write(::
xfer += oprot->writeFieldBegin("partStats", ::apache::thrift::protocol::T_MAP, 1);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_LIST, static_cast<uint32_t>(this->partStats.size()));
- std::map<std::string, std::vector<ColumnStatisticsObj> > ::const_iterator _iter225;
- for (_iter225 = this->partStats.begin(); _iter225 != this->partStats.end(); ++_iter225)
+ std::map<std::string, std::vector<ColumnStatisticsObj> > ::const_iterator _iter226;
+ for (_iter226 = this->partStats.begin(); _iter226 != this->partStats.end(); ++_iter226)
{
- xfer += oprot->writeString(_iter225->first);
+ xfer += oprot->writeString(_iter226->first);
{
- xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(_iter225->second.size()));
- std::vector<ColumnStatisticsObj> ::const_iterator _iter226;
- for (_iter226 = _iter225->second.begin(); _iter226 != _iter225->second.end(); ++_iter226)
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(_iter226->second.size()));
+ std::vector<ColumnStatisticsObj> ::const_iterator _iter227;
+ for (_iter227 = _iter226->second.begin(); _iter227 != _iter226->second.end(); ++_iter227)
{
- xfer += (*_iter226).write(oprot);
+ xfer += (*_iter227).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -4252,14 +4282,14 @@ uint32_t TableStatsRequest::read(::apach
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->colNames.clear();
- uint32_t _size227;
- ::apache::thrift::protocol::TType _etype230;
- xfer += iprot->readListBegin(_etype230, _size227);
- this->colNames.resize(_size227);
- uint32_t _i231;
- for (_i231 = 0; _i231 < _size227; ++_i231)
+ uint32_t _size228;
+ ::apache::thrift::protocol::TType _etype231;
+ xfer += iprot->readListBegin(_etype231, _size228);
+ this->colNames.resize(_size228);
+ uint32_t _i232;
+ for (_i232 = 0; _i232 < _size228; ++_i232)
{
- xfer += iprot->readString(this->colNames[_i231]);
+ xfer += iprot->readString(this->colNames[_i232]);
}
xfer += iprot->readListEnd();
}
@@ -4301,10 +4331,10 @@ uint32_t TableStatsRequest::write(::apac
xfer += oprot->writeFieldBegin("colNames", ::apache::thrift::protocol::T_LIST, 3);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->colNames.size()));
- std::vector<std::string> ::const_iterator _iter232;
- for (_iter232 = this->colNames.begin(); _iter232 != this->colNames.end(); ++_iter232)
+ std::vector<std::string> ::const_iterator _iter233;
+ for (_iter233 = this->colNames.begin(); _iter233 != this->colNames.end(); ++_iter233)
{
- xfer += oprot->writeString((*_iter232));
+ xfer += oprot->writeString((*_iter233));
}
xfer += oprot->writeListEnd();
}
@@ -4369,14 +4399,14 @@ uint32_t PartitionsStatsRequest::read(::
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->colNames.clear();
- uint32_t _size233;
- ::apache::thrift::protocol::TType _etype236;
- xfer += iprot->readListBegin(_etype236, _size233);
- this->colNames.resize(_size233);
- uint32_t _i237;
- for (_i237 = 0; _i237 < _size233; ++_i237)
+ uint32_t _size234;
+ ::apache::thrift::protocol::TType _etype237;
+ xfer += iprot->readListBegin(_etype237, _size234);
+ this->colNames.resize(_size234);
+ uint32_t _i238;
+ for (_i238 = 0; _i238 < _size234; ++_i238)
{
- xfer += iprot->readString(this->colNames[_i237]);
+ xfer += iprot->readString(this->colNames[_i238]);
}
xfer += iprot->readListEnd();
}
@@ -4389,14 +4419,14 @@ uint32_t PartitionsStatsRequest::read(::
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->partNames.clear();
- uint32_t _size238;
- ::apache::thrift::protocol::TType _etype241;
- xfer += iprot->readListBegin(_etype241, _size238);
- this->partNames.resize(_size238);
- uint32_t _i242;
- for (_i242 = 0; _i242 < _size238; ++_i242)
+ uint32_t _size239;
+ ::apache::thrift::protocol::TType _etype242;
+ xfer += iprot->readListBegin(_etype242, _size239);
+ this->partNames.resize(_size239);
+ uint32_t _i243;
+ for (_i243 = 0; _i243 < _size239; ++_i243)
{
- xfer += iprot->readString(this->partNames[_i242]);
+ xfer += iprot->readString(this->partNames[_i243]);
}
xfer += iprot->readListEnd();
}
@@ -4440,10 +4470,10 @@ uint32_t PartitionsStatsRequest::write(:
xfer += oprot->writeFieldBegin("colNames", ::apache::thrift::protocol::T_LIST, 3);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->colNames.size()));
- std::vector<std::string> ::const_iterator _iter243;
- for (_iter243 = this->colNames.begin(); _iter243 != this->colNames.end(); ++_iter243)
+ std::vector<std::string> ::const_iterator _iter244;
+ for (_iter244 = this->colNames.begin(); _iter244 != this->colNames.end(); ++_iter244)
{
- xfer += oprot->writeString((*_iter243));
+ xfer += oprot->writeString((*_iter244));
}
xfer += oprot->writeListEnd();
}
@@ -4452,10 +4482,10 @@ uint32_t PartitionsStatsRequest::write(:
xfer += oprot->writeFieldBegin("partNames", ::apache::thrift::protocol::T_LIST, 4);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->partNames.size()));
- std::vector<std::string> ::const_iterator _iter244;
- for (_iter244 = this->partNames.begin(); _iter244 != this->partNames.end(); ++_iter244)
+ std::vector<std::string> ::const_iterator _iter245;
+ for (_iter245 = this->partNames.begin(); _iter245 != this->partNames.end(); ++_iter245)
{
- xfer += oprot->writeString((*_iter244));
+ xfer += oprot->writeString((*_iter245));
}
xfer += oprot->writeListEnd();
}
@@ -4501,14 +4531,14 @@ uint32_t AddPartitionsResult::read(::apa
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->partitions.clear();
- uint32_t _size245;
- ::apache::thrift::protocol::TType _etype248;
- xfer += iprot->readListBegin(_etype248, _size245);
- this->partitions.resize(_size245);
- uint32_t _i249;
- for (_i249 = 0; _i249 < _size245; ++_i249)
+ uint32_t _size246;
+ ::apache::thrift::protocol::TType _etype249;
+ xfer += iprot->readListBegin(_etype249, _size246);
+ this->partitions.resize(_size246);
+ uint32_t _i250;
+ for (_i250 = 0; _i250 < _size246; ++_i250)
{
- xfer += this->partitions[_i249].read(iprot);
+ xfer += this->partitions[_i250].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -4537,10 +4567,10 @@ uint32_t AddPartitionsResult::write(::ap
xfer += oprot->writeFieldBegin("partitions", ::apache::thrift::protocol::T_LIST, 1);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->partitions.size()));
- std::vector<Partition> ::const_iterator _iter250;
- for (_iter250 = this->partitions.begin(); _iter250 != this->partitions.end(); ++_iter250)
+ std::vector<Partition> ::const_iterator _iter251;
+ for (_iter251 = this->partitions.begin(); _iter251 != this->partitions.end(); ++_iter251)
{
- xfer += (*_iter250).write(oprot);
+ xfer += (*_iter251).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -4604,14 +4634,14 @@ uint32_t AddPartitionsRequest::read(::ap
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->parts.clear();
- uint32_t _size251;
- ::apache::thrift::protocol::TType _etype254;
- xfer += iprot->readListBegin(_etype254, _size251);
- this->parts.resize(_size251);
- uint32_t _i255;
- for (_i255 = 0; _i255 < _size251; ++_i255)
+ uint32_t _size252;
+ ::apache::thrift::protocol::TType _etype255;
+ xfer += iprot->readListBegin(_etype255, _size252);
+ this->parts.resize(_size252);
+ uint32_t _i256;
+ for (_i256 = 0; _i256 < _size252; ++_i256)
{
- xfer += this->parts[_i255].read(iprot);
+ xfer += this->parts[_i256].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -4671,10 +4701,10 @@ uint32_t AddPartitionsRequest::write(::a
xfer += oprot->writeFieldBegin("parts", ::apache::thrift::protocol::T_LIST, 3);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->parts.size()));
- std::vector<Partition> ::const_iterator _iter256;
- for (_iter256 = this->parts.begin(); _iter256 != this->parts.end(); ++_iter256)
+ std::vector<Partition> ::const_iterator _iter257;
+ for (_iter257 = this->parts.begin(); _iter257 != this->parts.end(); ++_iter257)
{
- xfer += (*_iter256).write(oprot);
+ xfer += (*_iter257).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -4731,14 +4761,14 @@ uint32_t DropPartitionsResult::read(::ap
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->partitions.clear();
- uint32_t _size257;
- ::apache::thrift::protocol::TType _etype260;
- xfer += iprot->readListBegin(_etype260, _size257);
- this->partitions.resize(_size257);
- uint32_t _i261;
- for (_i261 = 0; _i261 < _size257; ++_i261)
+ uint32_t _size258;
+ ::apache::thrift::protocol::TType _etype261;
+ xfer += iprot->readListBegin(_etype261, _size258);
+ this->partitions.resize(_size258);
+ uint32_t _i262;
+ for (_i262 = 0; _i262 < _size258; ++_i262)
{
- xfer += this->partitions[_i261].read(iprot);
+ xfer += this->partitions[_i262].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -4767,10 +4797,10 @@ uint32_t DropPartitionsResult::write(::a
xfer += oprot->writeFieldBegin("partitions", ::apache::thrift::protocol::T_LIST, 1);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->partitions.size()));
- std::vector<Partition> ::const_iterator _iter262;
- for (_iter262 = this->partitions.begin(); _iter262 != this->partitions.end(); ++_iter262)
+ std::vector<Partition> ::const_iterator _iter263;
+ for (_iter263 = this->partitions.begin(); _iter263 != this->partitions.end(); ++_iter263)
{
- xfer += (*_iter262).write(oprot);
+ xfer += (*_iter263).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -4893,14 +4923,14 @@ uint32_t RequestPartsSpec::read(::apache
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->names.clear();
- uint32_t _size263;
- ::apache::thrift::protocol::TType _etype266;
- xfer += iprot->readListBegin(_etype266, _size263);
- this->names.resize(_size263);
- uint32_t _i267;
- for (_i267 = 0; _i267 < _size263; ++_i267)
+ uint32_t _size264;
+ ::apache::thrift::protocol::TType _etype267;
+ xfer += iprot->readListBegin(_etype267, _size264);
+ this->names.resize(_size264);
+ uint32_t _i268;
+ for (_i268 = 0; _i268 < _size264; ++_i268)
{
- xfer += iprot->readString(this->names[_i267]);
+ xfer += iprot->readString(this->names[_i268]);
}
xfer += iprot->readListEnd();
}
@@ -4913,14 +4943,14 @@ uint32_t RequestPartsSpec::read(::apache
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->exprs.clear();
- uint32_t _size268;
- ::apache::thrift::protocol::TType _etype271;
- xfer += iprot->readListBegin(_etype271, _size268);
- this->exprs.resize(_size268);
- uint32_t _i272;
- for (_i272 = 0; _i272 < _size268; ++_i272)
+ uint32_t _size269;
+ ::apache::thrift::protocol::TType _etype272;
+ xfer += iprot->readListBegin(_etype272, _size269);
+ this->exprs.resize(_size269);
+ uint32_t _i273;
+ for (_i273 = 0; _i273 < _size269; ++_i273)
{
- xfer += this->exprs[_i272].read(iprot);
+ xfer += this->exprs[_i273].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -4948,10 +4978,10 @@ uint32_t RequestPartsSpec::write(::apach
xfer += oprot->writeFieldBegin("names", ::apache::thrift::protocol::T_LIST, 1);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->names.size()));
- std::vector<std::string> ::const_iterator _iter273;
- for (_iter273 = this->names.begin(); _iter273 != this->names.end(); ++_iter273)
+ std::vector<std::string> ::const_iterator _iter274;
+ for (_iter274 = this->names.begin(); _iter274 != this->names.end(); ++_iter274)
{
- xfer += oprot->writeString((*_iter273));
+ xfer += oprot->writeString((*_iter274));
}
xfer += oprot->writeListEnd();
}
@@ -4960,10 +4990,10 @@ uint32_t RequestPartsSpec::write(::apach
xfer += oprot->writeFieldBegin("exprs", ::apache::thrift::protocol::T_LIST, 2);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->exprs.size()));
- std::vector<DropPartitionsExpr> ::const_iterator _iter274;
- for (_iter274 = this->exprs.begin(); _iter274 != this->exprs.end(); ++_iter274)
+ std::vector<DropPartitionsExpr> ::const_iterator _iter275;
+ for (_iter275 = this->exprs.begin(); _iter275 != this->exprs.end(); ++_iter275)
{
- xfer += (*_iter274).write(oprot);
+ xfer += (*_iter275).write(oprot);
}
xfer += oprot->writeListEnd();
}
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=1568880&r1=1568879&r2=1568880&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 Mon Feb 17 05:31:04 2014
@@ -667,21 +667,23 @@ class Role {
void swap(Role &a, Role &b);
typedef struct _Database__isset {
- _Database__isset() : name(false), description(false), locationUri(false), parameters(false), privileges(false) {}
+ _Database__isset() : name(false), description(false), locationUri(false), parameters(false), privileges(false), ownerName(false), ownerType(false) {}
bool name;
bool description;
bool locationUri;
bool parameters;
bool privileges;
+ bool ownerName;
+ bool ownerType;
} _Database__isset;
class Database {
public:
- static const char* ascii_fingerprint; // = "213967572143E49C9F1A23F7A866E2F5";
- static const uint8_t binary_fingerprint[16]; // = {0x21,0x39,0x67,0x57,0x21,0x43,0xE4,0x9C,0x9F,0x1A,0x23,0xF7,0xA8,0x66,0xE2,0xF5};
+ static const char* ascii_fingerprint; // = "553495CAE243A1C583D5C3DD990AED53";
+ static const uint8_t binary_fingerprint[16]; // = {0x55,0x34,0x95,0xCA,0xE2,0x43,0xA1,0xC5,0x83,0xD5,0xC3,0xDD,0x99,0x0A,0xED,0x53};
- Database() : name(), description(), locationUri() {
+ Database() : name(), description(), locationUri(), ownerName(), ownerType((PrincipalType::type)0) {
}
virtual ~Database() throw() {}
@@ -691,6 +693,8 @@ class Database {
std::string locationUri;
std::map<std::string, std::string> parameters;
PrincipalPrivilegeSet privileges;
+ std::string ownerName;
+ PrincipalType::type ownerType;
_Database__isset __isset;
@@ -715,6 +719,16 @@ class Database {
__isset.privileges = true;
}
+ void __set_ownerName(const std::string& val) {
+ ownerName = val;
+ __isset.ownerName = true;
+ }
+
+ void __set_ownerType(const PrincipalType::type val) {
+ ownerType = val;
+ __isset.ownerType = true;
+ }
+
bool operator == (const Database & rhs) const
{
if (!(name == rhs.name))
@@ -729,6 +743,14 @@ class Database {
return false;
else if (__isset.privileges && !(privileges == rhs.privileges))
return false;
+ if (__isset.ownerName != rhs.__isset.ownerName)
+ return false;
+ else if (__isset.ownerName && !(ownerName == rhs.ownerName))
+ return false;
+ if (__isset.ownerType != rhs.__isset.ownerType)
+ return false;
+ else if (__isset.ownerType && !(ownerType == rhs.ownerType))
+ return false;
return true;
}
bool operator != (const Database &rhs) const {
Modified: hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Database.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Database.java?rev=1568880&r1=1568879&r2=1568880&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Database.java (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Database.java Mon Feb 17 05:31:04 2014
@@ -39,6 +39,8 @@ public class Database implements org.apa
private static final org.apache.thrift.protocol.TField LOCATION_URI_FIELD_DESC = new org.apache.thrift.protocol.TField("locationUri", org.apache.thrift.protocol.TType.STRING, (short)3);
private static final org.apache.thrift.protocol.TField PARAMETERS_FIELD_DESC = new org.apache.thrift.protocol.TField("parameters", org.apache.thrift.protocol.TType.MAP, (short)4);
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)5);
+ private static final org.apache.thrift.protocol.TField OWNER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("ownerName", org.apache.thrift.protocol.TType.STRING, (short)6);
+ private static final org.apache.thrift.protocol.TField OWNER_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("ownerType", org.apache.thrift.protocol.TType.I32, (short)7);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -51,6 +53,8 @@ public class Database implements org.apa
private String locationUri; // required
private Map<String,String> parameters; // required
private PrincipalPrivilegeSet privileges; // optional
+ private String ownerName; // optional
+ private PrincipalType ownerType; // 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 {
@@ -58,7 +62,13 @@ public class Database implements org.apa
DESCRIPTION((short)2, "description"),
LOCATION_URI((short)3, "locationUri"),
PARAMETERS((short)4, "parameters"),
- PRIVILEGES((short)5, "privileges");
+ PRIVILEGES((short)5, "privileges"),
+ OWNER_NAME((short)6, "ownerName"),
+ /**
+ *
+ * @see PrincipalType
+ */
+ OWNER_TYPE((short)7, "ownerType");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -83,6 +93,10 @@ public class Database implements org.apa
return PARAMETERS;
case 5: // PRIVILEGES
return PRIVILEGES;
+ case 6: // OWNER_NAME
+ return OWNER_NAME;
+ case 7: // OWNER_TYPE
+ return OWNER_TYPE;
default:
return null;
}
@@ -123,7 +137,7 @@ public class Database implements org.apa
}
// isset id assignments
- private _Fields optionals[] = {_Fields.PRIVILEGES};
+ private _Fields optionals[] = {_Fields.PRIVILEGES,_Fields.OWNER_NAME,_Fields.OWNER_TYPE};
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);
@@ -139,6 +153,10 @@ public class Database implements org.apa
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.OWNER_NAME, new org.apache.thrift.meta_data.FieldMetaData("ownerName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.OWNER_TYPE, new org.apache.thrift.meta_data.FieldMetaData("ownerType", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, PrincipalType.class)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Database.class, metaDataMap);
}
@@ -190,6 +208,12 @@ public class Database implements org.apa
if (other.isSetPrivileges()) {
this.privileges = new PrincipalPrivilegeSet(other.privileges);
}
+ if (other.isSetOwnerName()) {
+ this.ownerName = other.ownerName;
+ }
+ if (other.isSetOwnerType()) {
+ this.ownerType = other.ownerType;
+ }
}
public Database deepCopy() {
@@ -203,6 +227,8 @@ public class Database implements org.apa
this.locationUri = null;
this.parameters = null;
this.privileges = null;
+ this.ownerName = null;
+ this.ownerType = null;
}
public String getName() {
@@ -331,6 +357,60 @@ public class Database implements org.apa
}
}
+ public String getOwnerName() {
+ return this.ownerName;
+ }
+
+ public void setOwnerName(String ownerName) {
+ this.ownerName = ownerName;
+ }
+
+ public void unsetOwnerName() {
+ this.ownerName = null;
+ }
+
+ /** Returns true if field ownerName is set (has been assigned a value) and false otherwise */
+ public boolean isSetOwnerName() {
+ return this.ownerName != null;
+ }
+
+ public void setOwnerNameIsSet(boolean value) {
+ if (!value) {
+ this.ownerName = null;
+ }
+ }
+
+ /**
+ *
+ * @see PrincipalType
+ */
+ public PrincipalType getOwnerType() {
+ return this.ownerType;
+ }
+
+ /**
+ *
+ * @see PrincipalType
+ */
+ public void setOwnerType(PrincipalType ownerType) {
+ this.ownerType = ownerType;
+ }
+
+ public void unsetOwnerType() {
+ this.ownerType = null;
+ }
+
+ /** Returns true if field ownerType is set (has been assigned a value) and false otherwise */
+ public boolean isSetOwnerType() {
+ return this.ownerType != null;
+ }
+
+ public void setOwnerTypeIsSet(boolean value) {
+ if (!value) {
+ this.ownerType = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case NAME:
@@ -373,6 +453,22 @@ public class Database implements org.apa
}
break;
+ case OWNER_NAME:
+ if (value == null) {
+ unsetOwnerName();
+ } else {
+ setOwnerName((String)value);
+ }
+ break;
+
+ case OWNER_TYPE:
+ if (value == null) {
+ unsetOwnerType();
+ } else {
+ setOwnerType((PrincipalType)value);
+ }
+ break;
+
}
}
@@ -393,6 +489,12 @@ public class Database implements org.apa
case PRIVILEGES:
return getPrivileges();
+ case OWNER_NAME:
+ return getOwnerName();
+
+ case OWNER_TYPE:
+ return getOwnerType();
+
}
throw new IllegalStateException();
}
@@ -414,6 +516,10 @@ public class Database implements org.apa
return isSetParameters();
case PRIVILEGES:
return isSetPrivileges();
+ case OWNER_NAME:
+ return isSetOwnerName();
+ case OWNER_TYPE:
+ return isSetOwnerType();
}
throw new IllegalStateException();
}
@@ -476,6 +582,24 @@ public class Database implements org.apa
return false;
}
+ boolean this_present_ownerName = true && this.isSetOwnerName();
+ boolean that_present_ownerName = true && that.isSetOwnerName();
+ if (this_present_ownerName || that_present_ownerName) {
+ if (!(this_present_ownerName && that_present_ownerName))
+ return false;
+ if (!this.ownerName.equals(that.ownerName))
+ return false;
+ }
+
+ boolean this_present_ownerType = true && this.isSetOwnerType();
+ boolean that_present_ownerType = true && that.isSetOwnerType();
+ if (this_present_ownerType || that_present_ownerType) {
+ if (!(this_present_ownerType && that_present_ownerType))
+ return false;
+ if (!this.ownerType.equals(that.ownerType))
+ return false;
+ }
+
return true;
}
@@ -508,6 +632,16 @@ public class Database implements org.apa
if (present_privileges)
builder.append(privileges);
+ boolean present_ownerName = true && (isSetOwnerName());
+ builder.append(present_ownerName);
+ if (present_ownerName)
+ builder.append(ownerName);
+
+ boolean present_ownerType = true && (isSetOwnerType());
+ builder.append(present_ownerType);
+ if (present_ownerType)
+ builder.append(ownerType.getValue());
+
return builder.toHashCode();
}
@@ -569,6 +703,26 @@ public class Database implements org.apa
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetOwnerName()).compareTo(typedOther.isSetOwnerName());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetOwnerName()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ownerName, typedOther.ownerName);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetOwnerType()).compareTo(typedOther.isSetOwnerType());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetOwnerType()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ownerType, typedOther.ownerType);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -630,6 +784,26 @@ public class Database implements org.apa
}
first = false;
}
+ if (isSetOwnerName()) {
+ if (!first) sb.append(", ");
+ sb.append("ownerName:");
+ if (this.ownerName == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.ownerName);
+ }
+ first = false;
+ }
+ if (isSetOwnerType()) {
+ if (!first) sb.append(", ");
+ sb.append("ownerType:");
+ if (this.ownerType == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.ownerType);
+ }
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -729,6 +903,22 @@ public class Database implements org.apa
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 6: // OWNER_NAME
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.ownerName = iprot.readString();
+ struct.setOwnerNameIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 7: // OWNER_TYPE
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.ownerType = PrincipalType.findByValue(iprot.readI32());
+ struct.setOwnerTypeIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -777,6 +967,20 @@ public class Database implements org.apa
oprot.writeFieldEnd();
}
}
+ if (struct.ownerName != null) {
+ if (struct.isSetOwnerName()) {
+ oprot.writeFieldBegin(OWNER_NAME_FIELD_DESC);
+ oprot.writeString(struct.ownerName);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.ownerType != null) {
+ if (struct.isSetOwnerType()) {
+ oprot.writeFieldBegin(OWNER_TYPE_FIELD_DESC);
+ oprot.writeI32(struct.ownerType.getValue());
+ oprot.writeFieldEnd();
+ }
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -810,7 +1014,13 @@ public class Database implements org.apa
if (struct.isSetPrivileges()) {
optionals.set(4);
}
- oprot.writeBitSet(optionals, 5);
+ if (struct.isSetOwnerName()) {
+ optionals.set(5);
+ }
+ if (struct.isSetOwnerType()) {
+ optionals.set(6);
+ }
+ oprot.writeBitSet(optionals, 7);
if (struct.isSetName()) {
oprot.writeString(struct.name);
}
@@ -833,12 +1043,18 @@ public class Database implements org.apa
if (struct.isSetPrivileges()) {
struct.privileges.write(oprot);
}
+ if (struct.isSetOwnerName()) {
+ oprot.writeString(struct.ownerName);
+ }
+ if (struct.isSetOwnerType()) {
+ oprot.writeI32(struct.ownerType.getValue());
+ }
}
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, Database struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(5);
+ BitSet incoming = iprot.readBitSet(7);
if (incoming.get(0)) {
struct.name = iprot.readString();
struct.setNameIsSet(true);
@@ -871,6 +1087,14 @@ public class Database implements org.apa
struct.privileges.read(iprot);
struct.setPrivilegesIsSet(true);
}
+ if (incoming.get(5)) {
+ struct.ownerName = iprot.readString();
+ struct.setOwnerNameIsSet(true);
+ }
+ if (incoming.get(6)) {
+ struct.ownerType = PrincipalType.findByValue(iprot.readI32());
+ struct.setOwnerTypeIsSet(true);
+ }
}
}
Modified: hive/trunk/metastore/src/gen/thrift/gen-php/metastore/Types.php
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-php/metastore/Types.php?rev=1568880&r1=1568879&r2=1568880&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-php/metastore/Types.php (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-php/metastore/Types.php Mon Feb 17 05:31:04 2014
@@ -1494,6 +1494,8 @@ class Database {
public $locationUri = null;
public $parameters = null;
public $privileges = null;
+ public $ownerName = null;
+ public $ownerType = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -1527,6 +1529,14 @@ class Database {
'type' => TType::STRUCT,
'class' => '\metastore\PrincipalPrivilegeSet',
),
+ 6 => array(
+ 'var' => 'ownerName',
+ 'type' => TType::STRING,
+ ),
+ 7 => array(
+ 'var' => 'ownerType',
+ 'type' => TType::I32,
+ ),
);
}
if (is_array($vals)) {
@@ -1545,6 +1555,12 @@ class Database {
if (isset($vals['privileges'])) {
$this->privileges = $vals['privileges'];
}
+ if (isset($vals['ownerName'])) {
+ $this->ownerName = $vals['ownerName'];
+ }
+ if (isset($vals['ownerType'])) {
+ $this->ownerType = $vals['ownerType'];
+ }
}
}
@@ -1616,6 +1632,20 @@ class Database {
$xfer += $input->skip($ftype);
}
break;
+ case 6:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->ownerName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 7:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->ownerType);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -1670,6 +1700,16 @@ class Database {
$xfer += $this->privileges->write($output);
$xfer += $output->writeFieldEnd();
}
+ if ($this->ownerName !== null) {
+ $xfer += $output->writeFieldBegin('ownerName', TType::STRING, 6);
+ $xfer += $output->writeString($this->ownerName);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ownerType !== null) {
+ $xfer += $output->writeFieldBegin('ownerType', TType::I32, 7);
+ $xfer += $output->writeI32($this->ownerType);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
Modified: hive/trunk/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py?rev=1568880&r1=1568879&r2=1568880&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py Mon Feb 17 05:31:04 2014
@@ -1015,6 +1015,8 @@ class Database:
- locationUri
- parameters
- privileges
+ - ownerName
+ - ownerType
"""
thrift_spec = (
@@ -1024,14 +1026,18 @@ class Database:
(3, TType.STRING, 'locationUri', None, None, ), # 3
(4, TType.MAP, 'parameters', (TType.STRING,None,TType.STRING,None), None, ), # 4
(5, TType.STRUCT, 'privileges', (PrincipalPrivilegeSet, PrincipalPrivilegeSet.thrift_spec), None, ), # 5
+ (6, TType.STRING, 'ownerName', None, None, ), # 6
+ (7, TType.I32, 'ownerType', None, None, ), # 7
)
- def __init__(self, name=None, description=None, locationUri=None, parameters=None, privileges=None,):
+ def __init__(self, name=None, description=None, locationUri=None, parameters=None, privileges=None, ownerName=None, ownerType=None,):
self.name = name
self.description = description
self.locationUri = locationUri
self.parameters = parameters
self.privileges = privileges
+ self.ownerName = ownerName
+ self.ownerType = ownerType
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:
@@ -1074,6 +1080,16 @@ class Database:
self.privileges.read(iprot)
else:
iprot.skip(ftype)
+ elif fid == 6:
+ if ftype == TType.STRING:
+ self.ownerName = iprot.readString();
+ else:
+ iprot.skip(ftype)
+ elif fid == 7:
+ if ftype == TType.I32:
+ self.ownerType = iprot.readI32();
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -1108,6 +1124,14 @@ class Database:
oprot.writeFieldBegin('privileges', TType.STRUCT, 5)
self.privileges.write(oprot)
oprot.writeFieldEnd()
+ if self.ownerName is not None:
+ oprot.writeFieldBegin('ownerName', TType.STRING, 6)
+ oprot.writeString(self.ownerName)
+ oprot.writeFieldEnd()
+ if self.ownerType is not None:
+ oprot.writeFieldBegin('ownerType', TType.I32, 7)
+ oprot.writeI32(self.ownerType)
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
Modified: hive/trunk/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb?rev=1568880&r1=1568879&r2=1568880&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb Mon Feb 17 05:31:04 2014
@@ -244,18 +244,25 @@ class Database
LOCATIONURI = 3
PARAMETERS = 4
PRIVILEGES = 5
+ OWNERNAME = 6
+ OWNERTYPE = 7
FIELDS = {
NAME => {:type => ::Thrift::Types::STRING, :name => 'name'},
DESCRIPTION => {:type => ::Thrift::Types::STRING, :name => 'description'},
LOCATIONURI => {:type => ::Thrift::Types::STRING, :name => 'locationUri'},
PARAMETERS => {:type => ::Thrift::Types::MAP, :name => 'parameters', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}},
- PRIVILEGES => {:type => ::Thrift::Types::STRUCT, :name => 'privileges', :class => ::PrincipalPrivilegeSet, :optional => true}
+ PRIVILEGES => {:type => ::Thrift::Types::STRUCT, :name => 'privileges', :class => ::PrincipalPrivilegeSet, :optional => true},
+ OWNERNAME => {:type => ::Thrift::Types::STRING, :name => 'ownerName', :optional => true},
+ OWNERTYPE => {:type => ::Thrift::Types::I32, :name => 'ownerType', :optional => true, :enum_class => ::PrincipalType}
}
def struct_fields; FIELDS; end
def validate
+ unless @ownerType.nil? || ::PrincipalType::VALID_VALUES.include?(@ownerType)
+ raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field ownerType!')
+ end
end
::Thrift::Struct.generate_accessors self
Modified: hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java?rev=1568880&r1=1568879&r2=1568880&view=diff
==============================================================================
--- hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java (original)
+++ hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java Mon Feb 17 05:31:04 2014
@@ -453,9 +453,11 @@ public class HiveMetaStore extends Thrif
try {
ms.getDatabase(DEFAULT_DATABASE_NAME);
} catch (NoSuchObjectException e) {
- ms.createDatabase(
- new Database(DEFAULT_DATABASE_NAME, DEFAULT_DATABASE_COMMENT,
- wh.getDefaultDatabasePath(DEFAULT_DATABASE_NAME).toString(), null));
+ Database db = new Database(DEFAULT_DATABASE_NAME, DEFAULT_DATABASE_COMMENT,
+ wh.getDefaultDatabasePath(DEFAULT_DATABASE_NAME).toString(), null);
+ db.setOwnerName(PUBLIC);
+ db.setOwnerType(PrincipalType.ROLE);
+ ms.createDatabase(db);
}
HMSHandler.createDefaultDB = true;
}