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/02/11 08:49:30 UTC

svn commit: r1243013 [3/9] - in /hive/trunk: common/src/java/org/apache/hadoop/hive/conf/ conf/ contrib/src/test/results/clientnegative/ contrib/src/test/results/clientpositive/ metastore/if/ metastore/scripts/upgrade/derby/ metastore/scripts/upgrade/m...

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=1243013&r1=1243012&r2=1243013&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 Sat Feb 11 07:49:28 2012
@@ -1253,8 +1253,73 @@ uint32_t Order::write(::apache::thrift::
   return xfer;
 }
 
-const char* StorageDescriptor::ascii_fingerprint = "11E4CE18F895C13812C853DFDCD1293F";
-const uint8_t StorageDescriptor::binary_fingerprint[16] = {0x11,0xE4,0xCE,0x18,0xF8,0x95,0xC1,0x38,0x12,0xC8,0x53,0xDF,0xDC,0xD1,0x29,0x3F};
+const char* RegionStorageDescriptor::ascii_fingerprint = "07A9615F837F7D0A952B595DD3020972";
+const uint8_t RegionStorageDescriptor::binary_fingerprint[16] = {0x07,0xA9,0x61,0x5F,0x83,0x7F,0x7D,0x0A,0x95,0x2B,0x59,0x5D,0xD3,0x02,0x09,0x72};
+
+uint32_t RegionStorageDescriptor::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->regionName);
+          this->__isset.regionName = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->location);
+          this->__isset.location = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t RegionStorageDescriptor::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("RegionStorageDescriptor");
+  xfer += oprot->writeFieldBegin("regionName", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString(this->regionName);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("location", ::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString(this->location);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+const char* StorageDescriptor::ascii_fingerprint = "67BFF60B597E40E541193F85E811DC8D";
+const uint8_t StorageDescriptor::binary_fingerprint[16] = {0x67,0xBF,0xF6,0x0B,0x59,0x7E,0x40,0xE5,0x41,0x19,0x3F,0x85,0xE8,0x11,0xDC,0x8D};
 
 uint32_t StorageDescriptor::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -1407,6 +1472,34 @@ uint32_t StorageDescriptor::read(::apach
           xfer += iprot->skip(ftype);
         }
         break;
+      case 11:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->primaryRegionName);
+          this->__isset.primaryRegionName = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 12:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->secondaryRegions.clear();
+            uint32_t _size101;
+            ::apache::thrift::protocol::TType _etype104;
+            iprot->readListBegin(_etype104, _size101);
+            this->secondaryRegions.resize(_size101);
+            uint32_t _i105;
+            for (_i105 = 0; _i105 < _size101; ++_i105)
+            {
+              xfer += this->secondaryRegions[_i105].read(iprot);
+            }
+            iprot->readListEnd();
+          }
+          this->__isset.secondaryRegions = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
       default:
         xfer += iprot->skip(ftype);
         break;
@@ -1425,10 +1518,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 _iter101;
-    for (_iter101 = this->cols.begin(); _iter101 != this->cols.end(); ++_iter101)
+    std::vector<FieldSchema> ::const_iterator _iter106;
+    for (_iter106 = this->cols.begin(); _iter106 != this->cols.end(); ++_iter106)
     {
-      xfer += (*_iter101).write(oprot);
+      xfer += (*_iter106).write(oprot);
     }
     xfer += oprot->writeListEnd();
   }
@@ -1454,10 +1547,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 _iter102;
-    for (_iter102 = this->bucketCols.begin(); _iter102 != this->bucketCols.end(); ++_iter102)
+    std::vector<std::string> ::const_iterator _iter107;
+    for (_iter107 = this->bucketCols.begin(); _iter107 != this->bucketCols.end(); ++_iter107)
     {
-      xfer += oprot->writeString((*_iter102));
+      xfer += oprot->writeString((*_iter107));
     }
     xfer += oprot->writeListEnd();
   }
@@ -1465,10 +1558,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 _iter103;
-    for (_iter103 = this->sortCols.begin(); _iter103 != this->sortCols.end(); ++_iter103)
+    std::vector<Order> ::const_iterator _iter108;
+    for (_iter108 = this->sortCols.begin(); _iter108 != this->sortCols.end(); ++_iter108)
     {
-      xfer += (*_iter103).write(oprot);
+      xfer += (*_iter108).write(oprot);
     }
     xfer += oprot->writeListEnd();
   }
@@ -1476,22 +1569,36 @@ 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 _iter104;
-    for (_iter104 = this->parameters.begin(); _iter104 != this->parameters.end(); ++_iter104)
+    std::map<std::string, std::string> ::const_iterator _iter109;
+    for (_iter109 = this->parameters.begin(); _iter109 != this->parameters.end(); ++_iter109)
     {
-      xfer += oprot->writeString(_iter104->first);
-      xfer += oprot->writeString(_iter104->second);
+      xfer += oprot->writeString(_iter109->first);
+      xfer += oprot->writeString(_iter109->second);
     }
     xfer += oprot->writeMapEnd();
   }
   xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("primaryRegionName", ::apache::thrift::protocol::T_STRING, 11);
+  xfer += oprot->writeString(this->primaryRegionName);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("secondaryRegions", ::apache::thrift::protocol::T_LIST, 12);
+  {
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->secondaryRegions.size()));
+    std::vector<RegionStorageDescriptor> ::const_iterator _iter110;
+    for (_iter110 = this->secondaryRegions.begin(); _iter110 != this->secondaryRegions.end(); ++_iter110)
+    {
+      xfer += (*_iter110).write(oprot);
+    }
+    xfer += oprot->writeListEnd();
+  }
+  xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
   xfer += oprot->writeStructEnd();
   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* Table::ascii_fingerprint = "6FF520A3FDB5F73BB03D09C027BC88E2";
+const uint8_t Table::binary_fingerprint[16] = {0x6F,0xF5,0x20,0xA3,0xFD,0xB5,0xF7,0x3B,0xB0,0x3D,0x09,0xC0,0x27,0xBC,0x88,0xE2};
 
 uint32_t Table::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -1573,14 +1680,14 @@ uint32_t Table::read(::apache::thrift::p
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->partitionKeys.clear();
-            uint32_t _size105;
-            ::apache::thrift::protocol::TType _etype108;
-            iprot->readListBegin(_etype108, _size105);
-            this->partitionKeys.resize(_size105);
-            uint32_t _i109;
-            for (_i109 = 0; _i109 < _size105; ++_i109)
+            uint32_t _size111;
+            ::apache::thrift::protocol::TType _etype114;
+            iprot->readListBegin(_etype114, _size111);
+            this->partitionKeys.resize(_size111);
+            uint32_t _i115;
+            for (_i115 = 0; _i115 < _size111; ++_i115)
             {
-              xfer += this->partitionKeys[_i109].read(iprot);
+              xfer += this->partitionKeys[_i115].read(iprot);
             }
             iprot->readListEnd();
           }
@@ -1593,17 +1700,17 @@ uint32_t Table::read(::apache::thrift::p
         if (ftype == ::apache::thrift::protocol::T_MAP) {
           {
             this->parameters.clear();
-            uint32_t _size110;
-            ::apache::thrift::protocol::TType _ktype111;
-            ::apache::thrift::protocol::TType _vtype112;
-            iprot->readMapBegin(_ktype111, _vtype112, _size110);
-            uint32_t _i114;
-            for (_i114 = 0; _i114 < _size110; ++_i114)
+            uint32_t _size116;
+            ::apache::thrift::protocol::TType _ktype117;
+            ::apache::thrift::protocol::TType _vtype118;
+            iprot->readMapBegin(_ktype117, _vtype118, _size116);
+            uint32_t _i120;
+            for (_i120 = 0; _i120 < _size116; ++_i120)
             {
-              std::string _key115;
-              xfer += iprot->readString(_key115);
-              std::string& _val116 = this->parameters[_key115];
-              xfer += iprot->readString(_val116);
+              std::string _key121;
+              xfer += iprot->readString(_key121);
+              std::string& _val122 = this->parameters[_key121];
+              xfer += iprot->readString(_val122);
             }
             iprot->readMapEnd();
           }
@@ -1683,10 +1790,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 _iter123;
+    for (_iter123 = this->partitionKeys.begin(); _iter123 != this->partitionKeys.end(); ++_iter123)
     {
-      xfer += (*_iter117).write(oprot);
+      xfer += (*_iter123).write(oprot);
     }
     xfer += oprot->writeListEnd();
   }
@@ -1694,11 +1801,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 _iter124;
+    for (_iter124 = this->parameters.begin(); _iter124 != this->parameters.end(); ++_iter124)
     {
-      xfer += oprot->writeString(_iter118->first);
-      xfer += oprot->writeString(_iter118->second);
+      xfer += oprot->writeString(_iter124->first);
+      xfer += oprot->writeString(_iter124->second);
     }
     xfer += oprot->writeMapEnd();
   }
@@ -1722,8 +1829,8 @@ uint32_t Table::write(::apache::thrift::
   return xfer;
 }
 
-const char* Partition::ascii_fingerprint = "F480E1D1B8AEBDDB37F8E180C0F07395";
-const uint8_t Partition::binary_fingerprint[16] = {0xF4,0x80,0xE1,0xD1,0xB8,0xAE,0xBD,0xDB,0x37,0xF8,0xE1,0x80,0xC0,0xF0,0x73,0x95};
+const char* Partition::ascii_fingerprint = "9DC9BCB205A70AFE078D9663673DA11B";
+const uint8_t Partition::binary_fingerprint[16] = {0x9D,0xC9,0xBC,0xB2,0x05,0xA7,0x0A,0xFE,0x07,0x8D,0x96,0x63,0x67,0x3D,0xA1,0x1B};
 
 uint32_t Partition::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -1749,14 +1856,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 +1916,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 +1961,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 +1987,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();
   }
@@ -1899,8 +2006,8 @@ uint32_t Partition::write(::apache::thri
   return xfer;
 }
 
-const char* Index::ascii_fingerprint = "5FEE4F7E28935B644F207D74459F6A29";
-const uint8_t Index::binary_fingerprint[16] = {0x5F,0xEE,0x4F,0x7E,0x28,0x93,0x5B,0x64,0x4F,0x20,0x7D,0x74,0x45,0x9F,0x6A,0x29};
+const char* Index::ascii_fingerprint = "23D1851E2E1791DEBCC4F08B8E0AA688";
+const uint8_t Index::binary_fingerprint[16] = {0x23,0xD1,0x85,0x1E,0x2E,0x17,0x91,0xDE,0xBC,0xC4,0xF0,0x8B,0x8E,0x0A,0xA6,0x88};
 
 uint32_t Index::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -1990,17 +2097,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 +2166,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 +2210,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 +2230,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 +2267,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 +2278,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();
   }

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=1243013&r1=1243012&r2=1243013&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 Sat Feb 11 07:49:28 2012
@@ -774,8 +774,57 @@ class Order {
 
 };
 
+typedef struct _RegionStorageDescriptor__isset {
+  _RegionStorageDescriptor__isset() : regionName(false), location(false) {}
+  bool regionName;
+  bool location;
+} _RegionStorageDescriptor__isset;
+
+class RegionStorageDescriptor {
+ 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};
+
+  RegionStorageDescriptor() : regionName(""), location("") {
+  }
+
+  virtual ~RegionStorageDescriptor() throw() {}
+
+  std::string regionName;
+  std::string location;
+
+  _RegionStorageDescriptor__isset __isset;
+
+  void __set_regionName(const std::string& val) {
+    regionName = val;
+  }
+
+  void __set_location(const std::string& val) {
+    location = val;
+  }
+
+  bool operator == (const RegionStorageDescriptor & rhs) const
+  {
+    if (!(regionName == rhs.regionName))
+      return false;
+    if (!(location == rhs.location))
+      return false;
+    return true;
+  }
+  bool operator != (const RegionStorageDescriptor &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const RegionStorageDescriptor & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
 typedef struct _StorageDescriptor__isset {
-  _StorageDescriptor__isset() : cols(false), location(false), inputFormat(false), outputFormat(false), compressed(false), numBuckets(false), serdeInfo(false), bucketCols(false), sortCols(false), parameters(false) {}
+  _StorageDescriptor__isset() : cols(false), location(false), inputFormat(false), outputFormat(false), compressed(false), numBuckets(false), serdeInfo(false), bucketCols(false), sortCols(false), parameters(false), primaryRegionName(false), secondaryRegions(false) {}
   bool cols;
   bool location;
   bool inputFormat;
@@ -786,15 +835,17 @@ typedef struct _StorageDescriptor__isset
   bool bucketCols;
   bool sortCols;
   bool parameters;
+  bool primaryRegionName;
+  bool secondaryRegions;
 } _StorageDescriptor__isset;
 
 class StorageDescriptor {
  public:
 
-  static const char* ascii_fingerprint; // = "11E4CE18F895C13812C853DFDCD1293F";
-  static const uint8_t binary_fingerprint[16]; // = {0x11,0xE4,0xCE,0x18,0xF8,0x95,0xC1,0x38,0x12,0xC8,0x53,0xDF,0xDC,0xD1,0x29,0x3F};
+  static const char* ascii_fingerprint; // = "67BFF60B597E40E541193F85E811DC8D";
+  static const uint8_t binary_fingerprint[16]; // = {0x67,0xBF,0xF6,0x0B,0x59,0x7E,0x40,0xE5,0x41,0x19,0x3F,0x85,0xE8,0x11,0xDC,0x8D};
 
-  StorageDescriptor() : location(""), inputFormat(""), outputFormat(""), compressed(0), numBuckets(0) {
+  StorageDescriptor() : location(""), inputFormat(""), outputFormat(""), compressed(0), numBuckets(0), primaryRegionName("") {
   }
 
   virtual ~StorageDescriptor() throw() {}
@@ -809,6 +860,8 @@ class StorageDescriptor {
   std::vector<std::string>  bucketCols;
   std::vector<Order>  sortCols;
   std::map<std::string, std::string>  parameters;
+  std::string primaryRegionName;
+  std::vector<RegionStorageDescriptor>  secondaryRegions;
 
   _StorageDescriptor__isset __isset;
 
@@ -852,6 +905,14 @@ class StorageDescriptor {
     parameters = val;
   }
 
+  void __set_primaryRegionName(const std::string& val) {
+    primaryRegionName = val;
+  }
+
+  void __set_secondaryRegions(const std::vector<RegionStorageDescriptor> & val) {
+    secondaryRegions = val;
+  }
+
   bool operator == (const StorageDescriptor & rhs) const
   {
     if (!(cols == rhs.cols))
@@ -874,6 +935,10 @@ class StorageDescriptor {
       return false;
     if (!(parameters == rhs.parameters))
       return false;
+    if (!(primaryRegionName == rhs.primaryRegionName))
+      return false;
+    if (!(secondaryRegions == rhs.secondaryRegions))
+      return false;
     return true;
   }
   bool operator != (const StorageDescriptor &rhs) const {
@@ -907,8 +972,8 @@ typedef struct _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; // = "6FF520A3FDB5F73BB03D09C027BC88E2";
+  static const uint8_t binary_fingerprint[16]; // = {0x6F,0xF5,0x20,0xA3,0xFD,0xB5,0xF7,0x3B,0xB0,0x3D,0x09,0xC0,0x27,0xBC,0x88,0xE2};
 
   Table() : tableName(""), dbName(""), owner(""), createTime(0), lastAccessTime(0), retention(0), viewOriginalText(""), viewExpandedText(""), tableType("") {
   }
@@ -1042,8 +1107,8 @@ typedef struct _Partition__isset {
 class Partition {
  public:
 
-  static const char* ascii_fingerprint; // = "F480E1D1B8AEBDDB37F8E180C0F07395";
-  static const uint8_t binary_fingerprint[16]; // = {0xF4,0x80,0xE1,0xD1,0xB8,0xAE,0xBD,0xDB,0x37,0xF8,0xE1,0x80,0xC0,0xF0,0x73,0x95};
+  static const char* ascii_fingerprint; // = "9DC9BCB205A70AFE078D9663673DA11B";
+  static const uint8_t binary_fingerprint[16]; // = {0x9D,0xC9,0xBC,0xB2,0x05,0xA7,0x0A,0xFE,0x07,0x8D,0x96,0x63,0x67,0x3D,0xA1,0x1B};
 
   Partition() : dbName(""), tableName(""), createTime(0), lastAccessTime(0) {
   }
@@ -1144,8 +1209,8 @@ typedef struct _Index__isset {
 class Index {
  public:
 
-  static const char* ascii_fingerprint; // = "5FEE4F7E28935B644F207D74459F6A29";
-  static const uint8_t binary_fingerprint[16]; // = {0x5F,0xEE,0x4F,0x7E,0x28,0x93,0x5B,0x64,0x4F,0x20,0x7D,0x74,0x45,0x9F,0x6A,0x29};
+  static const char* ascii_fingerprint; // = "23D1851E2E1791DEBCC4F08B8E0AA688";
+  static const uint8_t binary_fingerprint[16]; // = {0x23,0xD1,0x85,0x1E,0x2E,0x17,0x91,0xDE,0xBC,0xC4,0xF0,0x8B,0x8E,0x0A,0xA6,0x88};
 
   Index() : indexName(""), indexHandlerClass(""), dbName(""), origTableName(""), createTime(0), lastAccessTime(0), indexTableName(""), deferredRebuild(0) {
   }

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=1243013&r1=1243012&r2=1243013&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 Sat Feb 11 07:49:28 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=1243013&r1=1243012&r2=1243013&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 Sat Feb 11 07:49:28 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();
       }

Added: hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RegionStorageDescriptor.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RegionStorageDescriptor.java?rev=1243013&view=auto
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RegionStorageDescriptor.java (added)
+++ hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RegionStorageDescriptor.java Sat Feb 11 07:49:28 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 RegionStorageDescriptor implements org.apache.thrift.TBase<RegionStorageDescriptor, RegionStorageDescriptor._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RegionStorageDescriptor");
+
+  private static final org.apache.thrift.protocol.TField REGION_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("regionName", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.thrift.protocol.TField LOCATION_FIELD_DESC = new org.apache.thrift.protocol.TField("location", org.apache.thrift.protocol.TType.STRING, (short)2);
+
+  private String regionName; // required
+  private String location; // 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 {
+    REGION_NAME((short)1, "regionName"),
+    LOCATION((short)2, "location");
+
+    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: // REGION_NAME
+          return REGION_NAME;
+        case 2: // LOCATION
+          return LOCATION;
+        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.REGION_NAME, new org.apache.thrift.meta_data.FieldMetaData("regionName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.LOCATION, new org.apache.thrift.meta_data.FieldMetaData("location", 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(RegionStorageDescriptor.class, metaDataMap);
+  }
+
+  public RegionStorageDescriptor() {
+  }
+
+  public RegionStorageDescriptor(
+    String regionName,
+    String location)
+  {
+    this();
+    this.regionName = regionName;
+    this.location = location;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public RegionStorageDescriptor(RegionStorageDescriptor other) {
+    if (other.isSetRegionName()) {
+      this.regionName = other.regionName;
+    }
+    if (other.isSetLocation()) {
+      this.location = other.location;
+    }
+  }
+
+  public RegionStorageDescriptor deepCopy() {
+    return new RegionStorageDescriptor(this);
+  }
+
+  @Override
+  public void clear() {
+    this.regionName = null;
+    this.location = null;
+  }
+
+  public String getRegionName() {
+    return this.regionName;
+  }
+
+  public void setRegionName(String regionName) {
+    this.regionName = regionName;
+  }
+
+  public void unsetRegionName() {
+    this.regionName = null;
+  }
+
+  /** Returns true if field regionName is set (has been assigned a value) and false otherwise */
+  public boolean isSetRegionName() {
+    return this.regionName != null;
+  }
+
+  public void setRegionNameIsSet(boolean value) {
+    if (!value) {
+      this.regionName = null;
+    }
+  }
+
+  public String getLocation() {
+    return this.location;
+  }
+
+  public void setLocation(String location) {
+    this.location = location;
+  }
+
+  public void unsetLocation() {
+    this.location = null;
+  }
+
+  /** Returns true if field location is set (has been assigned a value) and false otherwise */
+  public boolean isSetLocation() {
+    return this.location != null;
+  }
+
+  public void setLocationIsSet(boolean value) {
+    if (!value) {
+      this.location = null;
+    }
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case REGION_NAME:
+      if (value == null) {
+        unsetRegionName();
+      } else {
+        setRegionName((String)value);
+      }
+      break;
+
+    case LOCATION:
+      if (value == null) {
+        unsetLocation();
+      } else {
+        setLocation((String)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case REGION_NAME:
+      return getRegionName();
+
+    case LOCATION:
+      return getLocation();
+
+    }
+    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 REGION_NAME:
+      return isSetRegionName();
+    case LOCATION:
+      return isSetLocation();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof RegionStorageDescriptor)
+      return this.equals((RegionStorageDescriptor)that);
+    return false;
+  }
+
+  public boolean equals(RegionStorageDescriptor that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_regionName = true && this.isSetRegionName();
+    boolean that_present_regionName = true && that.isSetRegionName();
+    if (this_present_regionName || that_present_regionName) {
+      if (!(this_present_regionName && that_present_regionName))
+        return false;
+      if (!this.regionName.equals(that.regionName))
+        return false;
+    }
+
+    boolean this_present_location = true && this.isSetLocation();
+    boolean that_present_location = true && that.isSetLocation();
+    if (this_present_location || that_present_location) {
+      if (!(this_present_location && that_present_location))
+        return false;
+      if (!this.location.equals(that.location))
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(RegionStorageDescriptor other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    RegionStorageDescriptor typedOther = (RegionStorageDescriptor)other;
+
+    lastComparison = Boolean.valueOf(isSetRegionName()).compareTo(typedOther.isSetRegionName());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetRegionName()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.regionName, typedOther.regionName);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetLocation()).compareTo(typedOther.isSetLocation());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetLocation()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.location, typedOther.location);
+      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: // REGION_NAME
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
+            this.regionName = iprot.readString();
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        case 2: // LOCATION
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
+            this.location = 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.regionName != null) {
+      oprot.writeFieldBegin(REGION_NAME_FIELD_DESC);
+      oprot.writeString(this.regionName);
+      oprot.writeFieldEnd();
+    }
+    if (this.location != null) {
+      oprot.writeFieldBegin(LOCATION_FIELD_DESC);
+      oprot.writeString(this.location);
+      oprot.writeFieldEnd();
+    }
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("RegionStorageDescriptor(");
+    boolean first = true;
+
+    sb.append("regionName:");
+    if (this.regionName == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.regionName);
+    }
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("location:");
+    if (this.location == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.location);
+    }
+    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);
+    }
+  }
+
+}
+

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=1243013&r1=1243012&r2=1243013&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 Sat Feb 11 07:49:28 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/StorageDescriptor.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java?rev=1243013&r1=1243012&r2=1243013&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java Sat Feb 11 07:49:28 2012
@@ -33,6 +33,8 @@ public class StorageDescriptor implement
   private static final org.apache.thrift.protocol.TField BUCKET_COLS_FIELD_DESC = new org.apache.thrift.protocol.TField("bucketCols", org.apache.thrift.protocol.TType.LIST, (short)8);
   private static final org.apache.thrift.protocol.TField SORT_COLS_FIELD_DESC = new org.apache.thrift.protocol.TField("sortCols", org.apache.thrift.protocol.TType.LIST, (short)9);
   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)10);
+  private static final org.apache.thrift.protocol.TField PRIMARY_REGION_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("primaryRegionName", org.apache.thrift.protocol.TType.STRING, (short)11);
+  private static final org.apache.thrift.protocol.TField SECONDARY_REGIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("secondaryRegions", org.apache.thrift.protocol.TType.LIST, (short)12);
 
   private List<FieldSchema> cols; // required
   private String location; // required
@@ -44,6 +46,8 @@ public class StorageDescriptor implement
   private List<String> bucketCols; // required
   private List<Order> sortCols; // required
   private Map<String,String> parameters; // required
+  private String primaryRegionName; // required
+  private List<RegionStorageDescriptor> secondaryRegions; // 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 {
@@ -56,7 +60,9 @@ public class StorageDescriptor implement
     SERDE_INFO((short)7, "serdeInfo"),
     BUCKET_COLS((short)8, "bucketCols"),
     SORT_COLS((short)9, "sortCols"),
-    PARAMETERS((short)10, "parameters");
+    PARAMETERS((short)10, "parameters"),
+    PRIMARY_REGION_NAME((short)11, "primaryRegionName"),
+    SECONDARY_REGIONS((short)12, "secondaryRegions");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -91,6 +97,10 @@ public class StorageDescriptor implement
           return SORT_COLS;
         case 10: // PARAMETERS
           return PARAMETERS;
+        case 11: // PRIMARY_REGION_NAME
+          return PRIMARY_REGION_NAME;
+        case 12: // SECONDARY_REGIONS
+          return SECONDARY_REGIONS;
         default:
           return null;
       }
@@ -163,6 +173,11 @@ public class StorageDescriptor implement
         new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+    tmpMap.put(_Fields.PRIMARY_REGION_NAME, new org.apache.thrift.meta_data.FieldMetaData("primaryRegionName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.SECONDARY_REGIONS, new org.apache.thrift.meta_data.FieldMetaData("secondaryRegions", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        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, RegionStorageDescriptor.class))));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(StorageDescriptor.class, metaDataMap);
   }
@@ -180,7 +195,9 @@ public class StorageDescriptor implement
     SerDeInfo serdeInfo,
     List<String> bucketCols,
     List<Order> sortCols,
-    Map<String,String> parameters)
+    Map<String,String> parameters,
+    String primaryRegionName,
+    List<RegionStorageDescriptor> secondaryRegions)
   {
     this();
     this.cols = cols;
@@ -195,6 +212,8 @@ public class StorageDescriptor implement
     this.bucketCols = bucketCols;
     this.sortCols = sortCols;
     this.parameters = parameters;
+    this.primaryRegionName = primaryRegionName;
+    this.secondaryRegions = secondaryRegions;
   }
 
   /**
@@ -253,6 +272,16 @@ public class StorageDescriptor implement
       }
       this.parameters = __this__parameters;
     }
+    if (other.isSetPrimaryRegionName()) {
+      this.primaryRegionName = other.primaryRegionName;
+    }
+    if (other.isSetSecondaryRegions()) {
+      List<RegionStorageDescriptor> __this__secondaryRegions = new ArrayList<RegionStorageDescriptor>();
+      for (RegionStorageDescriptor other_element : other.secondaryRegions) {
+        __this__secondaryRegions.add(new RegionStorageDescriptor(other_element));
+      }
+      this.secondaryRegions = __this__secondaryRegions;
+    }
   }
 
   public StorageDescriptor deepCopy() {
@@ -273,6 +302,8 @@ public class StorageDescriptor implement
     this.bucketCols = null;
     this.sortCols = null;
     this.parameters = null;
+    this.primaryRegionName = null;
+    this.secondaryRegions = null;
   }
 
   public int getColsSize() {
@@ -559,6 +590,67 @@ public class StorageDescriptor implement
     }
   }
 
+  public String getPrimaryRegionName() {
+    return this.primaryRegionName;
+  }
+
+  public void setPrimaryRegionName(String primaryRegionName) {
+    this.primaryRegionName = primaryRegionName;
+  }
+
+  public void unsetPrimaryRegionName() {
+    this.primaryRegionName = null;
+  }
+
+  /** Returns true if field primaryRegionName is set (has been assigned a value) and false otherwise */
+  public boolean isSetPrimaryRegionName() {
+    return this.primaryRegionName != null;
+  }
+
+  public void setPrimaryRegionNameIsSet(boolean value) {
+    if (!value) {
+      this.primaryRegionName = null;
+    }
+  }
+
+  public int getSecondaryRegionsSize() {
+    return (this.secondaryRegions == null) ? 0 : this.secondaryRegions.size();
+  }
+
+  public java.util.Iterator<RegionStorageDescriptor> getSecondaryRegionsIterator() {
+    return (this.secondaryRegions == null) ? null : this.secondaryRegions.iterator();
+  }
+
+  public void addToSecondaryRegions(RegionStorageDescriptor elem) {
+    if (this.secondaryRegions == null) {
+      this.secondaryRegions = new ArrayList<RegionStorageDescriptor>();
+    }
+    this.secondaryRegions.add(elem);
+  }
+
+  public List<RegionStorageDescriptor> getSecondaryRegions() {
+    return this.secondaryRegions;
+  }
+
+  public void setSecondaryRegions(List<RegionStorageDescriptor> secondaryRegions) {
+    this.secondaryRegions = secondaryRegions;
+  }
+
+  public void unsetSecondaryRegions() {
+    this.secondaryRegions = null;
+  }
+
+  /** Returns true if field secondaryRegions is set (has been assigned a value) and false otherwise */
+  public boolean isSetSecondaryRegions() {
+    return this.secondaryRegions != null;
+  }
+
+  public void setSecondaryRegionsIsSet(boolean value) {
+    if (!value) {
+      this.secondaryRegions = null;
+    }
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case COLS:
@@ -641,6 +733,22 @@ public class StorageDescriptor implement
       }
       break;
 
+    case PRIMARY_REGION_NAME:
+      if (value == null) {
+        unsetPrimaryRegionName();
+      } else {
+        setPrimaryRegionName((String)value);
+      }
+      break;
+
+    case SECONDARY_REGIONS:
+      if (value == null) {
+        unsetSecondaryRegions();
+      } else {
+        setSecondaryRegions((List<RegionStorageDescriptor>)value);
+      }
+      break;
+
     }
   }
 
@@ -676,6 +784,12 @@ public class StorageDescriptor implement
     case PARAMETERS:
       return getParameters();
 
+    case PRIMARY_REGION_NAME:
+      return getPrimaryRegionName();
+
+    case SECONDARY_REGIONS:
+      return getSecondaryRegions();
+
     }
     throw new IllegalStateException();
   }
@@ -707,6 +821,10 @@ public class StorageDescriptor implement
       return isSetSortCols();
     case PARAMETERS:
       return isSetParameters();
+    case PRIMARY_REGION_NAME:
+      return isSetPrimaryRegionName();
+    case SECONDARY_REGIONS:
+      return isSetSecondaryRegions();
     }
     throw new IllegalStateException();
   }
@@ -814,6 +932,24 @@ public class StorageDescriptor implement
         return false;
     }
 
+    boolean this_present_primaryRegionName = true && this.isSetPrimaryRegionName();
+    boolean that_present_primaryRegionName = true && that.isSetPrimaryRegionName();
+    if (this_present_primaryRegionName || that_present_primaryRegionName) {
+      if (!(this_present_primaryRegionName && that_present_primaryRegionName))
+        return false;
+      if (!this.primaryRegionName.equals(that.primaryRegionName))
+        return false;
+    }
+
+    boolean this_present_secondaryRegions = true && this.isSetSecondaryRegions();
+    boolean that_present_secondaryRegions = true && that.isSetSecondaryRegions();
+    if (this_present_secondaryRegions || that_present_secondaryRegions) {
+      if (!(this_present_secondaryRegions && that_present_secondaryRegions))
+        return false;
+      if (!this.secondaryRegions.equals(that.secondaryRegions))
+        return false;
+    }
+
     return true;
   }
 
@@ -930,6 +1066,26 @@ public class StorageDescriptor implement
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetPrimaryRegionName()).compareTo(typedOther.isSetPrimaryRegionName());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetPrimaryRegionName()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.primaryRegionName, typedOther.primaryRegionName);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetSecondaryRegions()).compareTo(typedOther.isSetSecondaryRegions());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetSecondaryRegions()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.secondaryRegions, typedOther.secondaryRegions);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -1064,6 +1220,31 @@ public class StorageDescriptor implement
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
+        case 11: // PRIMARY_REGION_NAME
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
+            this.primaryRegionName = iprot.readString();
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        case 12: // SECONDARY_REGIONS
+          if (field.type == org.apache.thrift.protocol.TType.LIST) {
+            {
+              org.apache.thrift.protocol.TList _list62 = iprot.readListBegin();
+              this.secondaryRegions = new ArrayList<RegionStorageDescriptor>(_list62.size);
+              for (int _i63 = 0; _i63 < _list62.size; ++_i63)
+              {
+                RegionStorageDescriptor _elem64; // required
+                _elem64 = new RegionStorageDescriptor();
+                _elem64.read(iprot);
+                this.secondaryRegions.add(_elem64);
+              }
+              iprot.readListEnd();
+            }
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
         default:
           org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       }
@@ -1081,9 +1262,9 @@ public class StorageDescriptor implement
       oprot.writeFieldBegin(COLS_FIELD_DESC);
       {
         oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.cols.size()));
-        for (FieldSchema _iter62 : this.cols)
+        for (FieldSchema _iter65 : this.cols)
         {
-          _iter62.write(oprot);
+          _iter65.write(oprot);
         }
         oprot.writeListEnd();
       }
@@ -1119,9 +1300,9 @@ public class StorageDescriptor implement
       oprot.writeFieldBegin(BUCKET_COLS_FIELD_DESC);
       {
         oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.bucketCols.size()));
-        for (String _iter63 : this.bucketCols)
+        for (String _iter66 : this.bucketCols)
         {
-          oprot.writeString(_iter63);
+          oprot.writeString(_iter66);
         }
         oprot.writeListEnd();
       }
@@ -1131,9 +1312,9 @@ public class StorageDescriptor implement
       oprot.writeFieldBegin(SORT_COLS_FIELD_DESC);
       {
         oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.sortCols.size()));
-        for (Order _iter64 : this.sortCols)
+        for (Order _iter67 : this.sortCols)
         {
-          _iter64.write(oprot);
+          _iter67.write(oprot);
         }
         oprot.writeListEnd();
       }
@@ -1143,15 +1324,32 @@ public class StorageDescriptor implement
       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> _iter65 : this.parameters.entrySet())
+        for (Map.Entry<String, String> _iter68 : this.parameters.entrySet())
         {
-          oprot.writeString(_iter65.getKey());
-          oprot.writeString(_iter65.getValue());
+          oprot.writeString(_iter68.getKey());
+          oprot.writeString(_iter68.getValue());
         }
         oprot.writeMapEnd();
       }
       oprot.writeFieldEnd();
     }
+    if (this.primaryRegionName != null) {
+      oprot.writeFieldBegin(PRIMARY_REGION_NAME_FIELD_DESC);
+      oprot.writeString(this.primaryRegionName);
+      oprot.writeFieldEnd();
+    }
+    if (this.secondaryRegions != null) {
+      oprot.writeFieldBegin(SECONDARY_REGIONS_FIELD_DESC);
+      {
+        oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.secondaryRegions.size()));
+        for (RegionStorageDescriptor _iter69 : this.secondaryRegions)
+        {
+          _iter69.write(oprot);
+        }
+        oprot.writeListEnd();
+      }
+      oprot.writeFieldEnd();
+    }
     oprot.writeFieldStop();
     oprot.writeStructEnd();
   }
@@ -1232,6 +1430,22 @@ public class StorageDescriptor implement
       sb.append(this.parameters);
     }
     first = false;
+    if (!first) sb.append(", ");
+    sb.append("primaryRegionName:");
+    if (this.primaryRegionName == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.primaryRegionName);
+    }
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("secondaryRegions:");
+    if (this.secondaryRegions == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.secondaryRegions);
+    }
+    first = false;
     sb.append(")");
     return sb.toString();
   }

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=1243013&r1=1243012&r2=1243013&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 Sat Feb 11 07:49:28 2012
@@ -1165,14 +1165,14 @@ public class Table implements org.apache
         case 8: // PARTITION_KEYS
           if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              org.apache.thrift.protocol.TList _list66 = iprot.readListBegin();
-              this.partitionKeys = new ArrayList<FieldSchema>(_list66.size);
-              for (int _i67 = 0; _i67 < _list66.size; ++_i67)
+              org.apache.thrift.protocol.TList _list70 = iprot.readListBegin();
+              this.partitionKeys = new ArrayList<FieldSchema>(_list70.size);
+              for (int _i71 = 0; _i71 < _list70.size; ++_i71)
               {
-                FieldSchema _elem68; // required
-                _elem68 = new FieldSchema();
-                _elem68.read(iprot);
-                this.partitionKeys.add(_elem68);
+                FieldSchema _elem72; // required
+                _elem72 = new FieldSchema();
+                _elem72.read(iprot);
+                this.partitionKeys.add(_elem72);
               }
               iprot.readListEnd();
             }
@@ -1183,15 +1183,15 @@ public class Table implements org.apache
         case 9: // PARAMETERS
           if (field.type == org.apache.thrift.protocol.TType.MAP) {
             {
-              org.apache.thrift.protocol.TMap _map69 = iprot.readMapBegin();
-              this.parameters = new HashMap<String,String>(2*_map69.size);
-              for (int _i70 = 0; _i70 < _map69.size; ++_i70)
+              org.apache.thrift.protocol.TMap _map73 = iprot.readMapBegin();
+              this.parameters = new HashMap<String,String>(2*_map73.size);
+              for (int _i74 = 0; _i74 < _map73.size; ++_i74)
               {
-                String _key71; // required
-                String _val72; // required
-                _key71 = iprot.readString();
-                _val72 = iprot.readString();
-                this.parameters.put(_key71, _val72);
+                String _key75; // required
+                String _val76; // required
+                _key75 = iprot.readString();
+                _val76 = iprot.readString();
+                this.parameters.put(_key75, _val76);
               }
               iprot.readMapEnd();
             }
@@ -1274,9 +1274,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 _iter77 : this.partitionKeys)
         {
-          _iter73.write(oprot);
+          _iter77.write(oprot);
         }
         oprot.writeListEnd();
       }
@@ -1286,10 +1286,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> _iter78 : this.parameters.entrySet())
         {
-          oprot.writeString(_iter74.getKey());
-          oprot.writeString(_iter74.getValue());
+          oprot.writeString(_iter78.getKey());
+          oprot.writeString(_iter78.getValue());
         }
         oprot.writeMapEnd();
       }