HIVE-24386 : Add builder methods for GetTablesRequest and GetPartitionsRequest to HiveMetaStoreClient(Narayanan Venkateswaran via Naveen Gangam)
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetastoreTransformer.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetastoreTransformer.java
index 9eb7792..4eb55e0 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetastoreTransformer.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetastoreTransformer.java
@@ -26,7 +26,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.hadoop.hive.metastore.HiveMetaStoreClient.GetTablesRequestBuilder;
+import org.apache.hadoop.hive.metastore.client.builder.GetTablesRequestBuilder;
 import org.apache.hadoop.hive.metastore.api.Catalog;
 import org.apache.hadoop.hive.metastore.api.Database;
 import org.apache.hadoop.hive.metastore.api.ExtendedTableInfo;
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestTenantBasedStorageHierarchy.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestTenantBasedStorageHierarchy.java
index 774403d..1280895 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestTenantBasedStorageHierarchy.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestTenantBasedStorageHierarchy.java
@@ -27,7 +27,7 @@
 import java.util.Map;
 
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hive.metastore.HiveMetaStoreClient.GetTablesRequestBuilder;
+import org.apache.hadoop.hive.metastore.client.builder.GetTablesRequestBuilder;
 import org.apache.hadoop.hive.metastore.api.Catalog;
 import org.apache.hadoop.hive.metastore.api.Database;
 import org.apache.hadoop.hive.metastore.api.ExtendedTableInfo;
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_types.cpp b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_types.cpp
index abf1ef8..8a28512 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_types.cpp
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_types.cpp
@@ -30390,6 +30390,158 @@
 }
 
 
+GetProjectionsSpec::~GetProjectionsSpec() noexcept {
+}
+
+
+void GetProjectionsSpec::__set_fieldList(const std::vector<std::string> & val) {
+  this->fieldList = val;
+}
+
+void GetProjectionsSpec::__set_includeParamKeyPattern(const std::string& val) {
+  this->includeParamKeyPattern = val;
+}
+
+void GetProjectionsSpec::__set_excludeParamKeyPattern(const std::string& val) {
+  this->excludeParamKeyPattern = val;
+}
+std::ostream& operator<<(std::ostream& out, const GetProjectionsSpec& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
+
+uint32_t GetProjectionsSpec::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*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_LIST) {
+          {
+            this->fieldList.clear();
+            uint32_t _size1134;
+            ::apache::thrift::protocol::TType _etype1137;
+            xfer += iprot->readListBegin(_etype1137, _size1134);
+            this->fieldList.resize(_size1134);
+            uint32_t _i1138;
+            for (_i1138 = 0; _i1138 < _size1134; ++_i1138)
+            {
+              xfer += iprot->readString(this->fieldList[_i1138]);
+            }
+            xfer += iprot->readListEnd();
+          }
+          this->__isset.fieldList = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->includeParamKeyPattern);
+          this->__isset.includeParamKeyPattern = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->excludeParamKeyPattern);
+          this->__isset.excludeParamKeyPattern = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t GetProjectionsSpec::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("GetProjectionsSpec");
+
+  xfer += oprot->writeFieldBegin("fieldList", ::apache::thrift::protocol::T_LIST, 1);
+  {
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->fieldList.size()));
+    std::vector<std::string> ::const_iterator _iter1139;
+    for (_iter1139 = this->fieldList.begin(); _iter1139 != this->fieldList.end(); ++_iter1139)
+    {
+      xfer += oprot->writeString((*_iter1139));
+    }
+    xfer += oprot->writeListEnd();
+  }
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("includeParamKeyPattern", ::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString(this->includeParamKeyPattern);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("excludeParamKeyPattern", ::apache::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeString(this->excludeParamKeyPattern);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+void swap(GetProjectionsSpec &a, GetProjectionsSpec &b) {
+  using ::std::swap;
+  swap(a.fieldList, b.fieldList);
+  swap(a.includeParamKeyPattern, b.includeParamKeyPattern);
+  swap(a.excludeParamKeyPattern, b.excludeParamKeyPattern);
+  swap(a.__isset, b.__isset);
+}
+
+GetProjectionsSpec::GetProjectionsSpec(const GetProjectionsSpec& other1140) {
+  fieldList = other1140.fieldList;
+  includeParamKeyPattern = other1140.includeParamKeyPattern;
+  excludeParamKeyPattern = other1140.excludeParamKeyPattern;
+  __isset = other1140.__isset;
+}
+GetProjectionsSpec& GetProjectionsSpec::operator=(const GetProjectionsSpec& other1141) {
+  fieldList = other1141.fieldList;
+  includeParamKeyPattern = other1141.includeParamKeyPattern;
+  excludeParamKeyPattern = other1141.excludeParamKeyPattern;
+  __isset = other1141.__isset;
+  return *this;
+}
+void GetProjectionsSpec::printTo(std::ostream& out) const {
+  using ::apache::thrift::to_string;
+  out << "GetProjectionsSpec(";
+  out << "fieldList=" << to_string(fieldList);
+  out << ", " << "includeParamKeyPattern=" << to_string(includeParamKeyPattern);
+  out << ", " << "excludeParamKeyPattern=" << to_string(excludeParamKeyPattern);
+  out << ")";
+}
+
+
 GetTableRequest::~GetTableRequest() noexcept {
 }
 
@@ -30523,14 +30675,14 @@
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->processorCapabilities.clear();
-            uint32_t _size1134;
-            ::apache::thrift::protocol::TType _etype1137;
-            xfer += iprot->readListBegin(_etype1137, _size1134);
-            this->processorCapabilities.resize(_size1134);
-            uint32_t _i1138;
-            for (_i1138 = 0; _i1138 < _size1134; ++_i1138)
+            uint32_t _size1142;
+            ::apache::thrift::protocol::TType _etype1145;
+            xfer += iprot->readListBegin(_etype1145, _size1142);
+            this->processorCapabilities.resize(_size1142);
+            uint32_t _i1146;
+            for (_i1146 = 0; _i1146 < _size1142; ++_i1146)
             {
-              xfer += iprot->readString(this->processorCapabilities[_i1138]);
+              xfer += iprot->readString(this->processorCapabilities[_i1146]);
             }
             xfer += iprot->readListEnd();
           }
@@ -30616,10 +30768,10 @@
     xfer += oprot->writeFieldBegin("processorCapabilities", ::apache::thrift::protocol::T_LIST, 8);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->processorCapabilities.size()));
-      std::vector<std::string> ::const_iterator _iter1139;
-      for (_iter1139 = this->processorCapabilities.begin(); _iter1139 != this->processorCapabilities.end(); ++_iter1139)
+      std::vector<std::string> ::const_iterator _iter1147;
+      for (_iter1147 = this->processorCapabilities.begin(); _iter1147 != this->processorCapabilities.end(); ++_iter1147)
       {
-        xfer += oprot->writeString((*_iter1139));
+        xfer += oprot->writeString((*_iter1147));
       }
       xfer += oprot->writeListEnd();
     }
@@ -30660,31 +30812,31 @@
   swap(a.__isset, b.__isset);
 }
 
-GetTableRequest::GetTableRequest(const GetTableRequest& other1140) {
-  dbName = other1140.dbName;
-  tblName = other1140.tblName;
-  capabilities = other1140.capabilities;
-  catName = other1140.catName;
-  validWriteIdList = other1140.validWriteIdList;
-  getColumnStats = other1140.getColumnStats;
-  processorCapabilities = other1140.processorCapabilities;
-  processorIdentifier = other1140.processorIdentifier;
-  engine = other1140.engine;
-  id = other1140.id;
-  __isset = other1140.__isset;
+GetTableRequest::GetTableRequest(const GetTableRequest& other1148) {
+  dbName = other1148.dbName;
+  tblName = other1148.tblName;
+  capabilities = other1148.capabilities;
+  catName = other1148.catName;
+  validWriteIdList = other1148.validWriteIdList;
+  getColumnStats = other1148.getColumnStats;
+  processorCapabilities = other1148.processorCapabilities;
+  processorIdentifier = other1148.processorIdentifier;
+  engine = other1148.engine;
+  id = other1148.id;
+  __isset = other1148.__isset;
 }
-GetTableRequest& GetTableRequest::operator=(const GetTableRequest& other1141) {
-  dbName = other1141.dbName;
-  tblName = other1141.tblName;
-  capabilities = other1141.capabilities;
-  catName = other1141.catName;
-  validWriteIdList = other1141.validWriteIdList;
-  getColumnStats = other1141.getColumnStats;
-  processorCapabilities = other1141.processorCapabilities;
-  processorIdentifier = other1141.processorIdentifier;
-  engine = other1141.engine;
-  id = other1141.id;
-  __isset = other1141.__isset;
+GetTableRequest& GetTableRequest::operator=(const GetTableRequest& other1149) {
+  dbName = other1149.dbName;
+  tblName = other1149.tblName;
+  capabilities = other1149.capabilities;
+  catName = other1149.catName;
+  validWriteIdList = other1149.validWriteIdList;
+  getColumnStats = other1149.getColumnStats;
+  processorCapabilities = other1149.processorCapabilities;
+  processorIdentifier = other1149.processorIdentifier;
+  engine = other1149.engine;
+  id = other1149.id;
+  __isset = other1149.__isset;
   return *this;
 }
 void GetTableRequest::printTo(std::ostream& out) const {
@@ -30801,15 +30953,15 @@
   swap(a.__isset, b.__isset);
 }
 
-GetTableResult::GetTableResult(const GetTableResult& other1142) {
-  table = other1142.table;
-  isStatsCompliant = other1142.isStatsCompliant;
-  __isset = other1142.__isset;
+GetTableResult::GetTableResult(const GetTableResult& other1150) {
+  table = other1150.table;
+  isStatsCompliant = other1150.isStatsCompliant;
+  __isset = other1150.__isset;
 }
-GetTableResult& GetTableResult::operator=(const GetTableResult& other1143) {
-  table = other1143.table;
-  isStatsCompliant = other1143.isStatsCompliant;
-  __isset = other1143.__isset;
+GetTableResult& GetTableResult::operator=(const GetTableResult& other1151) {
+  table = other1151.table;
+  isStatsCompliant = other1151.isStatsCompliant;
+  __isset = other1151.__isset;
   return *this;
 }
 void GetTableResult::printTo(std::ostream& out) const {
@@ -30899,14 +31051,14 @@
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->tblNames.clear();
-            uint32_t _size1144;
-            ::apache::thrift::protocol::TType _etype1147;
-            xfer += iprot->readListBegin(_etype1147, _size1144);
-            this->tblNames.resize(_size1144);
-            uint32_t _i1148;
-            for (_i1148 = 0; _i1148 < _size1144; ++_i1148)
+            uint32_t _size1152;
+            ::apache::thrift::protocol::TType _etype1155;
+            xfer += iprot->readListBegin(_etype1155, _size1152);
+            this->tblNames.resize(_size1152);
+            uint32_t _i1156;
+            for (_i1156 = 0; _i1156 < _size1152; ++_i1156)
             {
-              xfer += iprot->readString(this->tblNames[_i1148]);
+              xfer += iprot->readString(this->tblNames[_i1156]);
             }
             xfer += iprot->readListEnd();
           }
@@ -30935,14 +31087,14 @@
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->processorCapabilities.clear();
-            uint32_t _size1149;
-            ::apache::thrift::protocol::TType _etype1152;
-            xfer += iprot->readListBegin(_etype1152, _size1149);
-            this->processorCapabilities.resize(_size1149);
-            uint32_t _i1153;
-            for (_i1153 = 0; _i1153 < _size1149; ++_i1153)
+            uint32_t _size1157;
+            ::apache::thrift::protocol::TType _etype1160;
+            xfer += iprot->readListBegin(_etype1160, _size1157);
+            this->processorCapabilities.resize(_size1157);
+            uint32_t _i1161;
+            for (_i1161 = 0; _i1161 < _size1157; ++_i1161)
             {
-              xfer += iprot->readString(this->processorCapabilities[_i1153]);
+              xfer += iprot->readString(this->processorCapabilities[_i1161]);
             }
             xfer += iprot->readListEnd();
           }
@@ -30994,10 +31146,10 @@
     xfer += oprot->writeFieldBegin("tblNames", ::apache::thrift::protocol::T_LIST, 2);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->tblNames.size()));
-      std::vector<std::string> ::const_iterator _iter1154;
-      for (_iter1154 = this->tblNames.begin(); _iter1154 != this->tblNames.end(); ++_iter1154)
+      std::vector<std::string> ::const_iterator _iter1162;
+      for (_iter1162 = this->tblNames.begin(); _iter1162 != this->tblNames.end(); ++_iter1162)
       {
-        xfer += oprot->writeString((*_iter1154));
+        xfer += oprot->writeString((*_iter1162));
       }
       xfer += oprot->writeListEnd();
     }
@@ -31017,10 +31169,10 @@
     xfer += oprot->writeFieldBegin("processorCapabilities", ::apache::thrift::protocol::T_LIST, 5);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->processorCapabilities.size()));
-      std::vector<std::string> ::const_iterator _iter1155;
-      for (_iter1155 = this->processorCapabilities.begin(); _iter1155 != this->processorCapabilities.end(); ++_iter1155)
+      std::vector<std::string> ::const_iterator _iter1163;
+      for (_iter1163 = this->processorCapabilities.begin(); _iter1163 != this->processorCapabilities.end(); ++_iter1163)
       {
-        xfer += oprot->writeString((*_iter1155));
+        xfer += oprot->writeString((*_iter1163));
       }
       xfer += oprot->writeListEnd();
     }
@@ -31053,25 +31205,25 @@
   swap(a.__isset, b.__isset);
 }
 
-GetTablesRequest::GetTablesRequest(const GetTablesRequest& other1156) {
-  dbName = other1156.dbName;
-  tblNames = other1156.tblNames;
-  capabilities = other1156.capabilities;
-  catName = other1156.catName;
-  processorCapabilities = other1156.processorCapabilities;
-  processorIdentifier = other1156.processorIdentifier;
-  projectionSpec = other1156.projectionSpec;
-  __isset = other1156.__isset;
+GetTablesRequest::GetTablesRequest(const GetTablesRequest& other1164) {
+  dbName = other1164.dbName;
+  tblNames = other1164.tblNames;
+  capabilities = other1164.capabilities;
+  catName = other1164.catName;
+  processorCapabilities = other1164.processorCapabilities;
+  processorIdentifier = other1164.processorIdentifier;
+  projectionSpec = other1164.projectionSpec;
+  __isset = other1164.__isset;
 }
-GetTablesRequest& GetTablesRequest::operator=(const GetTablesRequest& other1157) {
-  dbName = other1157.dbName;
-  tblNames = other1157.tblNames;
-  capabilities = other1157.capabilities;
-  catName = other1157.catName;
-  processorCapabilities = other1157.processorCapabilities;
-  processorIdentifier = other1157.processorIdentifier;
-  projectionSpec = other1157.projectionSpec;
-  __isset = other1157.__isset;
+GetTablesRequest& GetTablesRequest::operator=(const GetTablesRequest& other1165) {
+  dbName = other1165.dbName;
+  tblNames = other1165.tblNames;
+  capabilities = other1165.capabilities;
+  catName = other1165.catName;
+  processorCapabilities = other1165.processorCapabilities;
+  processorIdentifier = other1165.processorIdentifier;
+  projectionSpec = other1165.projectionSpec;
+  __isset = other1165.__isset;
   return *this;
 }
 void GetTablesRequest::printTo(std::ostream& out) const {
@@ -31128,14 +31280,14 @@
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->tables.clear();
-            uint32_t _size1158;
-            ::apache::thrift::protocol::TType _etype1161;
-            xfer += iprot->readListBegin(_etype1161, _size1158);
-            this->tables.resize(_size1158);
-            uint32_t _i1162;
-            for (_i1162 = 0; _i1162 < _size1158; ++_i1162)
+            uint32_t _size1166;
+            ::apache::thrift::protocol::TType _etype1169;
+            xfer += iprot->readListBegin(_etype1169, _size1166);
+            this->tables.resize(_size1166);
+            uint32_t _i1170;
+            for (_i1170 = 0; _i1170 < _size1166; ++_i1170)
             {
-              xfer += this->tables[_i1162].read(iprot);
+              xfer += this->tables[_i1170].read(iprot);
             }
             xfer += iprot->readListEnd();
           }
@@ -31166,10 +31318,10 @@
   xfer += oprot->writeFieldBegin("tables", ::apache::thrift::protocol::T_LIST, 1);
   {
     xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->tables.size()));
-    std::vector<Table> ::const_iterator _iter1163;
-    for (_iter1163 = this->tables.begin(); _iter1163 != this->tables.end(); ++_iter1163)
+    std::vector<Table> ::const_iterator _iter1171;
+    for (_iter1171 = this->tables.begin(); _iter1171 != this->tables.end(); ++_iter1171)
     {
-      xfer += (*_iter1163).write(oprot);
+      xfer += (*_iter1171).write(oprot);
     }
     xfer += oprot->writeListEnd();
   }
@@ -31185,11 +31337,11 @@
   swap(a.tables, b.tables);
 }
 
-GetTablesResult::GetTablesResult(const GetTablesResult& other1164) {
-  tables = other1164.tables;
+GetTablesResult::GetTablesResult(const GetTablesResult& other1172) {
+  tables = other1172.tables;
 }
-GetTablesResult& GetTablesResult::operator=(const GetTablesResult& other1165) {
-  tables = other1165.tables;
+GetTablesResult& GetTablesResult::operator=(const GetTablesResult& other1173) {
+  tables = other1173.tables;
   return *this;
 }
 void GetTablesResult::printTo(std::ostream& out) const {
@@ -31310,14 +31462,14 @@
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->processorCapabilities.clear();
-            uint32_t _size1166;
-            ::apache::thrift::protocol::TType _etype1169;
-            xfer += iprot->readListBegin(_etype1169, _size1166);
-            this->processorCapabilities.resize(_size1166);
-            uint32_t _i1170;
-            for (_i1170 = 0; _i1170 < _size1166; ++_i1170)
+            uint32_t _size1174;
+            ::apache::thrift::protocol::TType _etype1177;
+            xfer += iprot->readListBegin(_etype1177, _size1174);
+            this->processorCapabilities.resize(_size1174);
+            uint32_t _i1178;
+            for (_i1178 = 0; _i1178 < _size1174; ++_i1178)
             {
-              xfer += iprot->readString(this->processorCapabilities[_i1170]);
+              xfer += iprot->readString(this->processorCapabilities[_i1178]);
             }
             xfer += iprot->readListEnd();
           }
@@ -31384,10 +31536,10 @@
     xfer += oprot->writeFieldBegin("processorCapabilities", ::apache::thrift::protocol::T_LIST, 6);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->processorCapabilities.size()));
-      std::vector<std::string> ::const_iterator _iter1171;
-      for (_iter1171 = this->processorCapabilities.begin(); _iter1171 != this->processorCapabilities.end(); ++_iter1171)
+      std::vector<std::string> ::const_iterator _iter1179;
+      for (_iter1179 = this->processorCapabilities.begin(); _iter1179 != this->processorCapabilities.end(); ++_iter1179)
       {
-        xfer += oprot->writeString((*_iter1171));
+        xfer += oprot->writeString((*_iter1179));
       }
       xfer += oprot->writeListEnd();
     }
@@ -31415,25 +31567,25 @@
   swap(a.__isset, b.__isset);
 }
 
-GetTablesExtRequest::GetTablesExtRequest(const GetTablesExtRequest& other1172) {
-  catalog = other1172.catalog;
-  database = other1172.database;
-  tableNamePattern = other1172.tableNamePattern;
-  requestedFields = other1172.requestedFields;
-  limit = other1172.limit;
-  processorCapabilities = other1172.processorCapabilities;
-  processorIdentifier = other1172.processorIdentifier;
-  __isset = other1172.__isset;
+GetTablesExtRequest::GetTablesExtRequest(const GetTablesExtRequest& other1180) {
+  catalog = other1180.catalog;
+  database = other1180.database;
+  tableNamePattern = other1180.tableNamePattern;
+  requestedFields = other1180.requestedFields;
+  limit = other1180.limit;
+  processorCapabilities = other1180.processorCapabilities;
+  processorIdentifier = other1180.processorIdentifier;
+  __isset = other1180.__isset;
 }
-GetTablesExtRequest& GetTablesExtRequest::operator=(const GetTablesExtRequest& other1173) {
-  catalog = other1173.catalog;
-  database = other1173.database;
-  tableNamePattern = other1173.tableNamePattern;
-  requestedFields = other1173.requestedFields;
-  limit = other1173.limit;
-  processorCapabilities = other1173.processorCapabilities;
-  processorIdentifier = other1173.processorIdentifier;
-  __isset = other1173.__isset;
+GetTablesExtRequest& GetTablesExtRequest::operator=(const GetTablesExtRequest& other1181) {
+  catalog = other1181.catalog;
+  database = other1181.database;
+  tableNamePattern = other1181.tableNamePattern;
+  requestedFields = other1181.requestedFields;
+  limit = other1181.limit;
+  processorCapabilities = other1181.processorCapabilities;
+  processorIdentifier = other1181.processorIdentifier;
+  __isset = other1181.__isset;
   return *this;
 }
 void GetTablesExtRequest::printTo(std::ostream& out) const {
@@ -31521,14 +31673,14 @@
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->requiredReadCapabilities.clear();
-            uint32_t _size1174;
-            ::apache::thrift::protocol::TType _etype1177;
-            xfer += iprot->readListBegin(_etype1177, _size1174);
-            this->requiredReadCapabilities.resize(_size1174);
-            uint32_t _i1178;
-            for (_i1178 = 0; _i1178 < _size1174; ++_i1178)
+            uint32_t _size1182;
+            ::apache::thrift::protocol::TType _etype1185;
+            xfer += iprot->readListBegin(_etype1185, _size1182);
+            this->requiredReadCapabilities.resize(_size1182);
+            uint32_t _i1186;
+            for (_i1186 = 0; _i1186 < _size1182; ++_i1186)
             {
-              xfer += iprot->readString(this->requiredReadCapabilities[_i1178]);
+              xfer += iprot->readString(this->requiredReadCapabilities[_i1186]);
             }
             xfer += iprot->readListEnd();
           }
@@ -31541,14 +31693,14 @@
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->requiredWriteCapabilities.clear();
-            uint32_t _size1179;
-            ::apache::thrift::protocol::TType _etype1182;
-            xfer += iprot->readListBegin(_etype1182, _size1179);
-            this->requiredWriteCapabilities.resize(_size1179);
-            uint32_t _i1183;
-            for (_i1183 = 0; _i1183 < _size1179; ++_i1183)
+            uint32_t _size1187;
+            ::apache::thrift::protocol::TType _etype1190;
+            xfer += iprot->readListBegin(_etype1190, _size1187);
+            this->requiredWriteCapabilities.resize(_size1187);
+            uint32_t _i1191;
+            for (_i1191 = 0; _i1191 < _size1187; ++_i1191)
             {
-              xfer += iprot->readString(this->requiredWriteCapabilities[_i1183]);
+              xfer += iprot->readString(this->requiredWriteCapabilities[_i1191]);
             }
             xfer += iprot->readListEnd();
           }
@@ -31589,10 +31741,10 @@
     xfer += oprot->writeFieldBegin("requiredReadCapabilities", ::apache::thrift::protocol::T_LIST, 3);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->requiredReadCapabilities.size()));
-      std::vector<std::string> ::const_iterator _iter1184;
-      for (_iter1184 = this->requiredReadCapabilities.begin(); _iter1184 != this->requiredReadCapabilities.end(); ++_iter1184)
+      std::vector<std::string> ::const_iterator _iter1192;
+      for (_iter1192 = this->requiredReadCapabilities.begin(); _iter1192 != this->requiredReadCapabilities.end(); ++_iter1192)
       {
-        xfer += oprot->writeString((*_iter1184));
+        xfer += oprot->writeString((*_iter1192));
       }
       xfer += oprot->writeListEnd();
     }
@@ -31602,10 +31754,10 @@
     xfer += oprot->writeFieldBegin("requiredWriteCapabilities", ::apache::thrift::protocol::T_LIST, 4);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->requiredWriteCapabilities.size()));
-      std::vector<std::string> ::const_iterator _iter1185;
-      for (_iter1185 = this->requiredWriteCapabilities.begin(); _iter1185 != this->requiredWriteCapabilities.end(); ++_iter1185)
+      std::vector<std::string> ::const_iterator _iter1193;
+      for (_iter1193 = this->requiredWriteCapabilities.begin(); _iter1193 != this->requiredWriteCapabilities.end(); ++_iter1193)
       {
-        xfer += oprot->writeString((*_iter1185));
+        xfer += oprot->writeString((*_iter1193));
       }
       xfer += oprot->writeListEnd();
     }
@@ -31625,19 +31777,19 @@
   swap(a.__isset, b.__isset);
 }
 
-ExtendedTableInfo::ExtendedTableInfo(const ExtendedTableInfo& other1186) {
-  tblName = other1186.tblName;
-  accessType = other1186.accessType;
-  requiredReadCapabilities = other1186.requiredReadCapabilities;
-  requiredWriteCapabilities = other1186.requiredWriteCapabilities;
-  __isset = other1186.__isset;
+ExtendedTableInfo::ExtendedTableInfo(const ExtendedTableInfo& other1194) {
+  tblName = other1194.tblName;
+  accessType = other1194.accessType;
+  requiredReadCapabilities = other1194.requiredReadCapabilities;
+  requiredWriteCapabilities = other1194.requiredWriteCapabilities;
+  __isset = other1194.__isset;
 }
-ExtendedTableInfo& ExtendedTableInfo::operator=(const ExtendedTableInfo& other1187) {
-  tblName = other1187.tblName;
-  accessType = other1187.accessType;
-  requiredReadCapabilities = other1187.requiredReadCapabilities;
-  requiredWriteCapabilities = other1187.requiredWriteCapabilities;
-  __isset = other1187.__isset;
+ExtendedTableInfo& ExtendedTableInfo::operator=(const ExtendedTableInfo& other1195) {
+  tblName = other1195.tblName;
+  accessType = other1195.accessType;
+  requiredReadCapabilities = other1195.requiredReadCapabilities;
+  requiredWriteCapabilities = other1195.requiredWriteCapabilities;
+  __isset = other1195.__isset;
   return *this;
 }
 void ExtendedTableInfo::printTo(std::ostream& out) const {
@@ -31722,14 +31874,14 @@
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->processorCapabilities.clear();
-            uint32_t _size1188;
-            ::apache::thrift::protocol::TType _etype1191;
-            xfer += iprot->readListBegin(_etype1191, _size1188);
-            this->processorCapabilities.resize(_size1188);
-            uint32_t _i1192;
-            for (_i1192 = 0; _i1192 < _size1188; ++_i1192)
+            uint32_t _size1196;
+            ::apache::thrift::protocol::TType _etype1199;
+            xfer += iprot->readListBegin(_etype1199, _size1196);
+            this->processorCapabilities.resize(_size1196);
+            uint32_t _i1200;
+            for (_i1200 = 0; _i1200 < _size1196; ++_i1200)
             {
-              xfer += iprot->readString(this->processorCapabilities[_i1192]);
+              xfer += iprot->readString(this->processorCapabilities[_i1200]);
             }
             xfer += iprot->readListEnd();
           }
@@ -31777,10 +31929,10 @@
     xfer += oprot->writeFieldBegin("processorCapabilities", ::apache::thrift::protocol::T_LIST, 3);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->processorCapabilities.size()));
-      std::vector<std::string> ::const_iterator _iter1193;
-      for (_iter1193 = this->processorCapabilities.begin(); _iter1193 != this->processorCapabilities.end(); ++_iter1193)
+      std::vector<std::string> ::const_iterator _iter1201;
+      for (_iter1201 = this->processorCapabilities.begin(); _iter1201 != this->processorCapabilities.end(); ++_iter1201)
       {
-        xfer += oprot->writeString((*_iter1193));
+        xfer += oprot->writeString((*_iter1201));
       }
       xfer += oprot->writeListEnd();
     }
@@ -31805,19 +31957,19 @@
   swap(a.__isset, b.__isset);
 }
 
-GetDatabaseRequest::GetDatabaseRequest(const GetDatabaseRequest& other1194) {
-  name = other1194.name;
-  catalogName = other1194.catalogName;
-  processorCapabilities = other1194.processorCapabilities;
-  processorIdentifier = other1194.processorIdentifier;
-  __isset = other1194.__isset;
+GetDatabaseRequest::GetDatabaseRequest(const GetDatabaseRequest& other1202) {
+  name = other1202.name;
+  catalogName = other1202.catalogName;
+  processorCapabilities = other1202.processorCapabilities;
+  processorIdentifier = other1202.processorIdentifier;
+  __isset = other1202.__isset;
 }
-GetDatabaseRequest& GetDatabaseRequest::operator=(const GetDatabaseRequest& other1195) {
-  name = other1195.name;
-  catalogName = other1195.catalogName;
-  processorCapabilities = other1195.processorCapabilities;
-  processorIdentifier = other1195.processorIdentifier;
-  __isset = other1195.__isset;
+GetDatabaseRequest& GetDatabaseRequest::operator=(const GetDatabaseRequest& other1203) {
+  name = other1203.name;
+  catalogName = other1203.catalogName;
+  processorCapabilities = other1203.processorCapabilities;
+  processorIdentifier = other1203.processorIdentifier;
+  __isset = other1203.__isset;
   return *this;
 }
 void GetDatabaseRequest::printTo(std::ostream& out) const {
@@ -31928,13 +32080,13 @@
   swap(a.purge, b.purge);
 }
 
-CmRecycleRequest::CmRecycleRequest(const CmRecycleRequest& other1196) {
-  dataPath = other1196.dataPath;
-  purge = other1196.purge;
+CmRecycleRequest::CmRecycleRequest(const CmRecycleRequest& other1204) {
+  dataPath = other1204.dataPath;
+  purge = other1204.purge;
 }
-CmRecycleRequest& CmRecycleRequest::operator=(const CmRecycleRequest& other1197) {
-  dataPath = other1197.dataPath;
-  purge = other1197.purge;
+CmRecycleRequest& CmRecycleRequest::operator=(const CmRecycleRequest& other1205) {
+  dataPath = other1205.dataPath;
+  purge = other1205.purge;
   return *this;
 }
 void CmRecycleRequest::printTo(std::ostream& out) const {
@@ -32000,11 +32152,11 @@
   (void) b;
 }
 
-CmRecycleResponse::CmRecycleResponse(const CmRecycleResponse& other1198) {
-  (void) other1198;
+CmRecycleResponse::CmRecycleResponse(const CmRecycleResponse& other1206) {
+  (void) other1206;
 }
-CmRecycleResponse& CmRecycleResponse::operator=(const CmRecycleResponse& other1199) {
-  (void) other1199;
+CmRecycleResponse& CmRecycleResponse::operator=(const CmRecycleResponse& other1207) {
+  (void) other1207;
   return *this;
 }
 void CmRecycleResponse::printTo(std::ostream& out) const {
@@ -32170,21 +32322,21 @@
   swap(a.__isset, b.__isset);
 }
 
-TableMeta::TableMeta(const TableMeta& other1200) {
-  dbName = other1200.dbName;
-  tableName = other1200.tableName;
-  tableType = other1200.tableType;
-  comments = other1200.comments;
-  catName = other1200.catName;
-  __isset = other1200.__isset;
+TableMeta::TableMeta(const TableMeta& other1208) {
+  dbName = other1208.dbName;
+  tableName = other1208.tableName;
+  tableType = other1208.tableType;
+  comments = other1208.comments;
+  catName = other1208.catName;
+  __isset = other1208.__isset;
 }
-TableMeta& TableMeta::operator=(const TableMeta& other1201) {
-  dbName = other1201.dbName;
-  tableName = other1201.tableName;
-  tableType = other1201.tableType;
-  comments = other1201.comments;
-  catName = other1201.catName;
-  __isset = other1201.__isset;
+TableMeta& TableMeta::operator=(const TableMeta& other1209) {
+  dbName = other1209.dbName;
+  tableName = other1209.tableName;
+  tableType = other1209.tableType;
+  comments = other1209.comments;
+  catName = other1209.catName;
+  __isset = other1209.__isset;
   return *this;
 }
 void TableMeta::printTo(std::ostream& out) const {
@@ -32276,11 +32428,11 @@
   swap(a.sourceTablesUpdateDeleteModified, b.sourceTablesUpdateDeleteModified);
 }
 
-Materialization::Materialization(const Materialization& other1202) {
-  sourceTablesUpdateDeleteModified = other1202.sourceTablesUpdateDeleteModified;
+Materialization::Materialization(const Materialization& other1210) {
+  sourceTablesUpdateDeleteModified = other1210.sourceTablesUpdateDeleteModified;
 }
-Materialization& Materialization::operator=(const Materialization& other1203) {
-  sourceTablesUpdateDeleteModified = other1203.sourceTablesUpdateDeleteModified;
+Materialization& Materialization::operator=(const Materialization& other1211) {
+  sourceTablesUpdateDeleteModified = other1211.sourceTablesUpdateDeleteModified;
   return *this;
 }
 void Materialization::printTo(std::ostream& out) const {
@@ -32357,9 +32509,9 @@
         break;
       case 2:
         if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast1204;
-          xfer += iprot->readI32(ecast1204);
-          this->status = (WMResourcePlanStatus::type)ecast1204;
+          int32_t ecast1212;
+          xfer += iprot->readI32(ecast1212);
+          this->status = (WMResourcePlanStatus::type)ecast1212;
           this->__isset.status = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -32447,21 +32599,21 @@
   swap(a.__isset, b.__isset);
 }
 
-WMResourcePlan::WMResourcePlan(const WMResourcePlan& other1205) {
-  name = other1205.name;
-  status = other1205.status;
-  queryParallelism = other1205.queryParallelism;
-  defaultPoolPath = other1205.defaultPoolPath;
-  ns = other1205.ns;
-  __isset = other1205.__isset;
+WMResourcePlan::WMResourcePlan(const WMResourcePlan& other1213) {
+  name = other1213.name;
+  status = other1213.status;
+  queryParallelism = other1213.queryParallelism;
+  defaultPoolPath = other1213.defaultPoolPath;
+  ns = other1213.ns;
+  __isset = other1213.__isset;
 }
-WMResourcePlan& WMResourcePlan::operator=(const WMResourcePlan& other1206) {
-  name = other1206.name;
-  status = other1206.status;
-  queryParallelism = other1206.queryParallelism;
-  defaultPoolPath = other1206.defaultPoolPath;
-  ns = other1206.ns;
-  __isset = other1206.__isset;
+WMResourcePlan& WMResourcePlan::operator=(const WMResourcePlan& other1214) {
+  name = other1214.name;
+  status = other1214.status;
+  queryParallelism = other1214.queryParallelism;
+  defaultPoolPath = other1214.defaultPoolPath;
+  ns = other1214.ns;
+  __isset = other1214.__isset;
   return *this;
 }
 void WMResourcePlan::printTo(std::ostream& out) const {
@@ -32552,9 +32704,9 @@
         break;
       case 2:
         if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast1207;
-          xfer += iprot->readI32(ecast1207);
-          this->status = (WMResourcePlanStatus::type)ecast1207;
+          int32_t ecast1215;
+          xfer += iprot->readI32(ecast1215);
+          this->status = (WMResourcePlanStatus::type)ecast1215;
           this->__isset.status = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -32669,25 +32821,25 @@
   swap(a.__isset, b.__isset);
 }
 
-WMNullableResourcePlan::WMNullableResourcePlan(const WMNullableResourcePlan& other1208) {
-  name = other1208.name;
-  status = other1208.status;
-  queryParallelism = other1208.queryParallelism;
-  isSetQueryParallelism = other1208.isSetQueryParallelism;
-  defaultPoolPath = other1208.defaultPoolPath;
-  isSetDefaultPoolPath = other1208.isSetDefaultPoolPath;
-  ns = other1208.ns;
-  __isset = other1208.__isset;
+WMNullableResourcePlan::WMNullableResourcePlan(const WMNullableResourcePlan& other1216) {
+  name = other1216.name;
+  status = other1216.status;
+  queryParallelism = other1216.queryParallelism;
+  isSetQueryParallelism = other1216.isSetQueryParallelism;
+  defaultPoolPath = other1216.defaultPoolPath;
+  isSetDefaultPoolPath = other1216.isSetDefaultPoolPath;
+  ns = other1216.ns;
+  __isset = other1216.__isset;
 }
-WMNullableResourcePlan& WMNullableResourcePlan::operator=(const WMNullableResourcePlan& other1209) {
-  name = other1209.name;
-  status = other1209.status;
-  queryParallelism = other1209.queryParallelism;
-  isSetQueryParallelism = other1209.isSetQueryParallelism;
-  defaultPoolPath = other1209.defaultPoolPath;
-  isSetDefaultPoolPath = other1209.isSetDefaultPoolPath;
-  ns = other1209.ns;
-  __isset = other1209.__isset;
+WMNullableResourcePlan& WMNullableResourcePlan::operator=(const WMNullableResourcePlan& other1217) {
+  name = other1217.name;
+  status = other1217.status;
+  queryParallelism = other1217.queryParallelism;
+  isSetQueryParallelism = other1217.isSetQueryParallelism;
+  defaultPoolPath = other1217.defaultPoolPath;
+  isSetDefaultPoolPath = other1217.isSetDefaultPoolPath;
+  ns = other1217.ns;
+  __isset = other1217.__isset;
   return *this;
 }
 void WMNullableResourcePlan::printTo(std::ostream& out) const {
@@ -32878,23 +33030,23 @@
   swap(a.__isset, b.__isset);
 }
 
-WMPool::WMPool(const WMPool& other1210) {
-  resourcePlanName = other1210.resourcePlanName;
-  poolPath = other1210.poolPath;
-  allocFraction = other1210.allocFraction;
-  queryParallelism = other1210.queryParallelism;
-  schedulingPolicy = other1210.schedulingPolicy;
-  ns = other1210.ns;
-  __isset = other1210.__isset;
+WMPool::WMPool(const WMPool& other1218) {
+  resourcePlanName = other1218.resourcePlanName;
+  poolPath = other1218.poolPath;
+  allocFraction = other1218.allocFraction;
+  queryParallelism = other1218.queryParallelism;
+  schedulingPolicy = other1218.schedulingPolicy;
+  ns = other1218.ns;
+  __isset = other1218.__isset;
 }
-WMPool& WMPool::operator=(const WMPool& other1211) {
-  resourcePlanName = other1211.resourcePlanName;
-  poolPath = other1211.poolPath;
-  allocFraction = other1211.allocFraction;
-  queryParallelism = other1211.queryParallelism;
-  schedulingPolicy = other1211.schedulingPolicy;
-  ns = other1211.ns;
-  __isset = other1211.__isset;
+WMPool& WMPool::operator=(const WMPool& other1219) {
+  resourcePlanName = other1219.resourcePlanName;
+  poolPath = other1219.poolPath;
+  allocFraction = other1219.allocFraction;
+  queryParallelism = other1219.queryParallelism;
+  schedulingPolicy = other1219.schedulingPolicy;
+  ns = other1219.ns;
+  __isset = other1219.__isset;
   return *this;
 }
 void WMPool::printTo(std::ostream& out) const {
@@ -33103,25 +33255,25 @@
   swap(a.__isset, b.__isset);
 }
 
-WMNullablePool::WMNullablePool(const WMNullablePool& other1212) {
-  resourcePlanName = other1212.resourcePlanName;
-  poolPath = other1212.poolPath;
-  allocFraction = other1212.allocFraction;
-  queryParallelism = other1212.queryParallelism;
-  schedulingPolicy = other1212.schedulingPolicy;
-  isSetSchedulingPolicy = other1212.isSetSchedulingPolicy;
-  ns = other1212.ns;
-  __isset = other1212.__isset;
+WMNullablePool::WMNullablePool(const WMNullablePool& other1220) {
+  resourcePlanName = other1220.resourcePlanName;
+  poolPath = other1220.poolPath;
+  allocFraction = other1220.allocFraction;
+  queryParallelism = other1220.queryParallelism;
+  schedulingPolicy = other1220.schedulingPolicy;
+  isSetSchedulingPolicy = other1220.isSetSchedulingPolicy;
+  ns = other1220.ns;
+  __isset = other1220.__isset;
 }
-WMNullablePool& WMNullablePool::operator=(const WMNullablePool& other1213) {
-  resourcePlanName = other1213.resourcePlanName;
-  poolPath = other1213.poolPath;
-  allocFraction = other1213.allocFraction;
-  queryParallelism = other1213.queryParallelism;
-  schedulingPolicy = other1213.schedulingPolicy;
-  isSetSchedulingPolicy = other1213.isSetSchedulingPolicy;
-  ns = other1213.ns;
-  __isset = other1213.__isset;
+WMNullablePool& WMNullablePool::operator=(const WMNullablePool& other1221) {
+  resourcePlanName = other1221.resourcePlanName;
+  poolPath = other1221.poolPath;
+  allocFraction = other1221.allocFraction;
+  queryParallelism = other1221.queryParallelism;
+  schedulingPolicy = other1221.schedulingPolicy;
+  isSetSchedulingPolicy = other1221.isSetSchedulingPolicy;
+  ns = other1221.ns;
+  __isset = other1221.__isset;
   return *this;
 }
 void WMNullablePool::printTo(std::ostream& out) const {
@@ -33312,23 +33464,23 @@
   swap(a.__isset, b.__isset);
 }
 
-WMTrigger::WMTrigger(const WMTrigger& other1214) {
-  resourcePlanName = other1214.resourcePlanName;
-  triggerName = other1214.triggerName;
-  triggerExpression = other1214.triggerExpression;
-  actionExpression = other1214.actionExpression;
-  isInUnmanaged = other1214.isInUnmanaged;
-  ns = other1214.ns;
-  __isset = other1214.__isset;
+WMTrigger::WMTrigger(const WMTrigger& other1222) {
+  resourcePlanName = other1222.resourcePlanName;
+  triggerName = other1222.triggerName;
+  triggerExpression = other1222.triggerExpression;
+  actionExpression = other1222.actionExpression;
+  isInUnmanaged = other1222.isInUnmanaged;
+  ns = other1222.ns;
+  __isset = other1222.__isset;
 }
-WMTrigger& WMTrigger::operator=(const WMTrigger& other1215) {
-  resourcePlanName = other1215.resourcePlanName;
-  triggerName = other1215.triggerName;
-  triggerExpression = other1215.triggerExpression;
-  actionExpression = other1215.actionExpression;
-  isInUnmanaged = other1215.isInUnmanaged;
-  ns = other1215.ns;
-  __isset = other1215.__isset;
+WMTrigger& WMTrigger::operator=(const WMTrigger& other1223) {
+  resourcePlanName = other1223.resourcePlanName;
+  triggerName = other1223.triggerName;
+  triggerExpression = other1223.triggerExpression;
+  actionExpression = other1223.actionExpression;
+  isInUnmanaged = other1223.isInUnmanaged;
+  ns = other1223.ns;
+  __isset = other1223.__isset;
   return *this;
 }
 void WMTrigger::printTo(std::ostream& out) const {
@@ -33519,23 +33671,23 @@
   swap(a.__isset, b.__isset);
 }
 
-WMMapping::WMMapping(const WMMapping& other1216) {
-  resourcePlanName = other1216.resourcePlanName;
-  entityType = other1216.entityType;
-  entityName = other1216.entityName;
-  poolPath = other1216.poolPath;
-  ordering = other1216.ordering;
-  ns = other1216.ns;
-  __isset = other1216.__isset;
+WMMapping::WMMapping(const WMMapping& other1224) {
+  resourcePlanName = other1224.resourcePlanName;
+  entityType = other1224.entityType;
+  entityName = other1224.entityName;
+  poolPath = other1224.poolPath;
+  ordering = other1224.ordering;
+  ns = other1224.ns;
+  __isset = other1224.__isset;
 }
-WMMapping& WMMapping::operator=(const WMMapping& other1217) {
-  resourcePlanName = other1217.resourcePlanName;
-  entityType = other1217.entityType;
-  entityName = other1217.entityName;
-  poolPath = other1217.poolPath;
-  ordering = other1217.ordering;
-  ns = other1217.ns;
-  __isset = other1217.__isset;
+WMMapping& WMMapping::operator=(const WMMapping& other1225) {
+  resourcePlanName = other1225.resourcePlanName;
+  entityType = other1225.entityType;
+  entityName = other1225.entityName;
+  poolPath = other1225.poolPath;
+  ordering = other1225.ordering;
+  ns = other1225.ns;
+  __isset = other1225.__isset;
   return *this;
 }
 void WMMapping::printTo(std::ostream& out) const {
@@ -33668,17 +33820,17 @@
   swap(a.__isset, b.__isset);
 }
 
-WMPoolTrigger::WMPoolTrigger(const WMPoolTrigger& other1218) {
-  pool = other1218.pool;
-  trigger = other1218.trigger;
-  ns = other1218.ns;
-  __isset = other1218.__isset;
+WMPoolTrigger::WMPoolTrigger(const WMPoolTrigger& other1226) {
+  pool = other1226.pool;
+  trigger = other1226.trigger;
+  ns = other1226.ns;
+  __isset = other1226.__isset;
 }
-WMPoolTrigger& WMPoolTrigger::operator=(const WMPoolTrigger& other1219) {
-  pool = other1219.pool;
-  trigger = other1219.trigger;
-  ns = other1219.ns;
-  __isset = other1219.__isset;
+WMPoolTrigger& WMPoolTrigger::operator=(const WMPoolTrigger& other1227) {
+  pool = other1227.pool;
+  trigger = other1227.trigger;
+  ns = other1227.ns;
+  __isset = other1227.__isset;
   return *this;
 }
 void WMPoolTrigger::printTo(std::ostream& out) const {
@@ -33759,14 +33911,14 @@
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->pools.clear();
-            uint32_t _size1220;
-            ::apache::thrift::protocol::TType _etype1223;
-            xfer += iprot->readListBegin(_etype1223, _size1220);
-            this->pools.resize(_size1220);
-            uint32_t _i1224;
-            for (_i1224 = 0; _i1224 < _size1220; ++_i1224)
+            uint32_t _size1228;
+            ::apache::thrift::protocol::TType _etype1231;
+            xfer += iprot->readListBegin(_etype1231, _size1228);
+            this->pools.resize(_size1228);
+            uint32_t _i1232;
+            for (_i1232 = 0; _i1232 < _size1228; ++_i1232)
             {
-              xfer += this->pools[_i1224].read(iprot);
+              xfer += this->pools[_i1232].read(iprot);
             }
             xfer += iprot->readListEnd();
           }
@@ -33779,14 +33931,14 @@
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->mappings.clear();
-            uint32_t _size1225;
-            ::apache::thrift::protocol::TType _etype1228;
-            xfer += iprot->readListBegin(_etype1228, _size1225);
-            this->mappings.resize(_size1225);
-            uint32_t _i1229;
-            for (_i1229 = 0; _i1229 < _size1225; ++_i1229)
+            uint32_t _size1233;
+            ::apache::thrift::protocol::TType _etype1236;
+            xfer += iprot->readListBegin(_etype1236, _size1233);
+            this->mappings.resize(_size1233);
+            uint32_t _i1237;
+            for (_i1237 = 0; _i1237 < _size1233; ++_i1237)
             {
-              xfer += this->mappings[_i1229].read(iprot);
+              xfer += this->mappings[_i1237].read(iprot);
             }
             xfer += iprot->readListEnd();
           }
@@ -33799,14 +33951,14 @@
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->triggers.clear();
-            uint32_t _size1230;
-            ::apache::thrift::protocol::TType _etype1233;
-            xfer += iprot->readListBegin(_etype1233, _size1230);
-            this->triggers.resize(_size1230);
-            uint32_t _i1234;
-            for (_i1234 = 0; _i1234 < _size1230; ++_i1234)
+            uint32_t _size1238;
+            ::apache::thrift::protocol::TType _etype1241;
+            xfer += iprot->readListBegin(_etype1241, _size1238);
+            this->triggers.resize(_size1238);
+            uint32_t _i1242;
+            for (_i1242 = 0; _i1242 < _size1238; ++_i1242)
             {
-              xfer += this->triggers[_i1234].read(iprot);
+              xfer += this->triggers[_i1242].read(iprot);
             }
             xfer += iprot->readListEnd();
           }
@@ -33819,14 +33971,14 @@
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->poolTriggers.clear();
-            uint32_t _size1235;
-            ::apache::thrift::protocol::TType _etype1238;
-            xfer += iprot->readListBegin(_etype1238, _size1235);
-            this->poolTriggers.resize(_size1235);
-            uint32_t _i1239;
-            for (_i1239 = 0; _i1239 < _size1235; ++_i1239)
+            uint32_t _size1243;
+            ::apache::thrift::protocol::TType _etype1246;
+            xfer += iprot->readListBegin(_etype1246, _size1243);
+            this->poolTriggers.resize(_size1243);
+            uint32_t _i1247;
+            for (_i1247 = 0; _i1247 < _size1243; ++_i1247)
             {
-              xfer += this->poolTriggers[_i1239].read(iprot);
+              xfer += this->poolTriggers[_i1247].read(iprot);
             }
             xfer += iprot->readListEnd();
           }
@@ -33863,10 +34015,10 @@
   xfer += oprot->writeFieldBegin("pools", ::apache::thrift::protocol::T_LIST, 2);
   {
     xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->pools.size()));
-    std::vector<WMPool> ::const_iterator _iter1240;
-    for (_iter1240 = this->pools.begin(); _iter1240 != this->pools.end(); ++_iter1240)
+    std::vector<WMPool> ::const_iterator _iter1248;
+    for (_iter1248 = this->pools.begin(); _iter1248 != this->pools.end(); ++_iter1248)
     {
-      xfer += (*_iter1240).write(oprot);
+      xfer += (*_iter1248).write(oprot);
     }
     xfer += oprot->writeListEnd();
   }
@@ -33876,10 +34028,10 @@
     xfer += oprot->writeFieldBegin("mappings", ::apache::thrift::protocol::T_LIST, 3);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->mappings.size()));
-      std::vector<WMMapping> ::const_iterator _iter1241;
-      for (_iter1241 = this->mappings.begin(); _iter1241 != this->mappings.end(); ++_iter1241)
+      std::vector<WMMapping> ::const_iterator _iter1249;
+      for (_iter1249 = this->mappings.begin(); _iter1249 != this->mappings.end(); ++_iter1249)
       {
-        xfer += (*_iter1241).write(oprot);
+        xfer += (*_iter1249).write(oprot);
       }
       xfer += oprot->writeListEnd();
     }
@@ -33889,10 +34041,10 @@
     xfer += oprot->writeFieldBegin("triggers", ::apache::thrift::protocol::T_LIST, 4);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->triggers.size()));
-      std::vector<WMTrigger> ::const_iterator _iter1242;
-      for (_iter1242 = this->triggers.begin(); _iter1242 != this->triggers.end(); ++_iter1242)
+      std::vector<WMTrigger> ::const_iterator _iter1250;
+      for (_iter1250 = this->triggers.begin(); _iter1250 != this->triggers.end(); ++_iter1250)
       {
-        xfer += (*_iter1242).write(oprot);
+        xfer += (*_iter1250).write(oprot);
       }
       xfer += oprot->writeListEnd();
     }
@@ -33902,10 +34054,10 @@
     xfer += oprot->writeFieldBegin("poolTriggers", ::apache::thrift::protocol::T_LIST, 5);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->poolTriggers.size()));
-      std::vector<WMPoolTrigger> ::const_iterator _iter1243;
-      for (_iter1243 = this->poolTriggers.begin(); _iter1243 != this->poolTriggers.end(); ++_iter1243)
+      std::vector<WMPoolTrigger> ::const_iterator _iter1251;
+      for (_iter1251 = this->poolTriggers.begin(); _iter1251 != this->poolTriggers.end(); ++_iter1251)
       {
-        xfer += (*_iter1243).write(oprot);
+        xfer += (*_iter1251).write(oprot);
       }
       xfer += oprot->writeListEnd();
     }
@@ -33926,21 +34078,21 @@
   swap(a.__isset, b.__isset);
 }
 
-WMFullResourcePlan::WMFullResourcePlan(const WMFullResourcePlan& other1244) {
-  plan = other1244.plan;
-  pools = other1244.pools;
-  mappings = other1244.mappings;
-  triggers = other1244.triggers;
-  poolTriggers = other1244.poolTriggers;
-  __isset = other1244.__isset;
+WMFullResourcePlan::WMFullResourcePlan(const WMFullResourcePlan& other1252) {
+  plan = other1252.plan;
+  pools = other1252.pools;
+  mappings = other1252.mappings;
+  triggers = other1252.triggers;
+  poolTriggers = other1252.poolTriggers;
+  __isset = other1252.__isset;
 }
-WMFullResourcePlan& WMFullResourcePlan::operator=(const WMFullResourcePlan& other1245) {
-  plan = other1245.plan;
-  pools = other1245.pools;
-  mappings = other1245.mappings;
-  triggers = other1245.triggers;
-  poolTriggers = other1245.poolTriggers;
-  __isset = other1245.__isset;
+WMFullResourcePlan& WMFullResourcePlan::operator=(const WMFullResourcePlan& other1253) {
+  plan = other1253.plan;
+  pools = other1253.pools;
+  mappings = other1253.mappings;
+  triggers = other1253.triggers;
+  poolTriggers = other1253.poolTriggers;
+  __isset = other1253.__isset;
   return *this;
 }
 void WMFullResourcePlan::printTo(std::ostream& out) const {
@@ -34051,15 +34203,15 @@
   swap(a.__isset, b.__isset);
 }
 
-WMCreateResourcePlanRequest::WMCreateResourcePlanRequest(const WMCreateResourcePlanRequest& other1246) {
-  resourcePlan = other1246.resourcePlan;
-  copyFrom = other1246.copyFrom;
-  __isset = other1246.__isset;
+WMCreateResourcePlanRequest::WMCreateResourcePlanRequest(const WMCreateResourcePlanRequest& other1254) {
+  resourcePlan = other1254.resourcePlan;
+  copyFrom = other1254.copyFrom;
+  __isset = other1254.__isset;
 }
-WMCreateResourcePlanRequest& WMCreateResourcePlanRequest::operator=(const WMCreateResourcePlanRequest& other1247) {
-  resourcePlan = other1247.resourcePlan;
-  copyFrom = other1247.copyFrom;
-  __isset = other1247.__isset;
+WMCreateResourcePlanRequest& WMCreateResourcePlanRequest::operator=(const WMCreateResourcePlanRequest& other1255) {
+  resourcePlan = other1255.resourcePlan;
+  copyFrom = other1255.copyFrom;
+  __isset = other1255.__isset;
   return *this;
 }
 void WMCreateResourcePlanRequest::printTo(std::ostream& out) const {
@@ -34125,11 +34277,11 @@
   (void) b;
 }
 
-WMCreateResourcePlanResponse::WMCreateResourcePlanResponse(const WMCreateResourcePlanResponse& other1248) {
-  (void) other1248;
+WMCreateResourcePlanResponse::WMCreateResourcePlanResponse(const WMCreateResourcePlanResponse& other1256) {
+  (void) other1256;
 }
-WMCreateResourcePlanResponse& WMCreateResourcePlanResponse::operator=(const WMCreateResourcePlanResponse& other1249) {
-  (void) other1249;
+WMCreateResourcePlanResponse& WMCreateResourcePlanResponse::operator=(const WMCreateResourcePlanResponse& other1257) {
+  (void) other1257;
   return *this;
 }
 void WMCreateResourcePlanResponse::printTo(std::ostream& out) const {
@@ -34216,13 +34368,13 @@
   swap(a.__isset, b.__isset);
 }
 
-WMGetActiveResourcePlanRequest::WMGetActiveResourcePlanRequest(const WMGetActiveResourcePlanRequest& other1250) {
-  ns = other1250.ns;
-  __isset = other1250.__isset;
+WMGetActiveResourcePlanRequest::WMGetActiveResourcePlanRequest(const WMGetActiveResourcePlanRequest& other1258) {
+  ns = other1258.ns;
+  __isset = other1258.__isset;
 }
-WMGetActiveResourcePlanRequest& WMGetActiveResourcePlanRequest::operator=(const WMGetActiveResourcePlanRequest& other1251) {
-  ns = other1251.ns;
-  __isset = other1251.__isset;
+WMGetActiveResourcePlanRequest& WMGetActiveResourcePlanRequest::operator=(const WMGetActiveResourcePlanRequest& other1259) {
+  ns = other1259.ns;
+  __isset = other1259.__isset;
   return *this;
 }
 void WMGetActiveResourcePlanRequest::printTo(std::ostream& out) const {
@@ -34310,13 +34462,13 @@
   swap(a.__isset, b.__isset);
 }
 
-WMGetActiveResourcePlanResponse::WMGetActiveResourcePlanResponse(const WMGetActiveResourcePlanResponse& other1252) {
-  resourcePlan = other1252.resourcePlan;
-  __isset = other1252.__isset;
+WMGetActiveResourcePlanResponse::WMGetActiveResourcePlanResponse(const WMGetActiveResourcePlanResponse& other1260) {
+  resourcePlan = other1260.resourcePlan;
+  __isset = other1260.__isset;
 }
-WMGetActiveResourcePlanResponse& WMGetActiveResourcePlanResponse::operator=(const WMGetActiveResourcePlanResponse& other1253) {
-  resourcePlan = other1253.resourcePlan;
-  __isset = other1253.__isset;
+WMGetActiveResourcePlanResponse& WMGetActiveResourcePlanResponse::operator=(const WMGetActiveResourcePlanResponse& other1261) {
+  resourcePlan = other1261.resourcePlan;
+  __isset = other1261.__isset;
   return *this;
 }
 void WMGetActiveResourcePlanResponse::printTo(std::ostream& out) const {
@@ -34423,15 +34575,15 @@
   swap(a.__isset, b.__isset);
 }
 
-WMGetResourcePlanRequest::WMGetResourcePlanRequest(const WMGetResourcePlanRequest& other1254) {
-  resourcePlanName = other1254.resourcePlanName;
-  ns = other1254.ns;
-  __isset = other1254.__isset;
+WMGetResourcePlanRequest::WMGetResourcePlanRequest(const WMGetResourcePlanRequest& other1262) {
+  resourcePlanName = other1262.resourcePlanName;
+  ns = other1262.ns;
+  __isset = other1262.__isset;
 }
-WMGetResourcePlanRequest& WMGetResourcePlanRequest::operator=(const WMGetResourcePlanRequest& other1255) {
-  resourcePlanName = other1255.resourcePlanName;
-  ns = other1255.ns;
-  __isset = other1255.__isset;
+WMGetResourcePlanRequest& WMGetResourcePlanRequest::operator=(const WMGetResourcePlanRequest& other1263) {
+  resourcePlanName = other1263.resourcePlanName;
+  ns = other1263.ns;
+  __isset = other1263.__isset;
   return *this;
 }
 void WMGetResourcePlanRequest::printTo(std::ostream& out) const {
@@ -34520,13 +34672,13 @@
   swap(a.__isset, b.__isset);
 }
 
-WMGetResourcePlanResponse::WMGetResourcePlanResponse(const WMGetResourcePlanResponse& other1256) {
-  resourcePlan = other1256.resourcePlan;
-  __isset = other1256.__isset;
+WMGetResourcePlanResponse::WMGetResourcePlanResponse(const WMGetResourcePlanResponse& other1264) {
+  resourcePlan = other1264.resourcePlan;
+  __isset = other1264.__isset;
 }
-WMGetResourcePlanResponse& WMGetResourcePlanResponse::operator=(const WMGetResourcePlanResponse& other1257) {
-  resourcePlan = other1257.resourcePlan;
-  __isset = other1257.__isset;
+WMGetResourcePlanResponse& WMGetResourcePlanResponse::operator=(const WMGetResourcePlanResponse& other1265) {
+  resourcePlan = other1265.resourcePlan;
+  __isset = other1265.__isset;
   return *this;
 }
 void WMGetResourcePlanResponse::printTo(std::ostream& out) const {
@@ -34614,13 +34766,13 @@
   swap(a.__isset, b.__isset);
 }
 
-WMGetAllResourcePlanRequest::WMGetAllResourcePlanRequest(const WMGetAllResourcePlanRequest& other1258) {
-  ns = other1258.ns;
-  __isset = other1258.__isset;
+WMGetAllResourcePlanRequest::WMGetAllResourcePlanRequest(const WMGetAllResourcePlanRequest& other1266) {
+  ns = other1266.ns;
+  __isset = other1266.__isset;
 }
-WMGetAllResourcePlanRequest& WMGetAllResourcePlanRequest::operator=(const WMGetAllResourcePlanRequest& other1259) {
-  ns = other1259.ns;
-  __isset = other1259.__isset;
+WMGetAllResourcePlanRequest& WMGetAllResourcePlanRequest::operator=(const WMGetAllResourcePlanRequest& other1267) {
+  ns = other1267.ns;
+  __isset = other1267.__isset;
   return *this;
 }
 void WMGetAllResourcePlanRequest::printTo(std::ostream& out) const {
@@ -34671,14 +34823,14 @@
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->resourcePlans.clear();
-            uint32_t _size1260;
-            ::apache::thrift::protocol::TType _etype1263;
-            xfer += iprot->readListBegin(_etype1263, _size1260);
-            this->resourcePlans.resize(_size1260);
-            uint32_t _i1264;
-            for (_i1264 = 0; _i1264 < _size1260; ++_i1264)
+            uint32_t _size1268;
+            ::apache::thrift::protocol::TType _etype1271;
+            xfer += iprot->readListBegin(_etype1271, _size1268);
+            this->resourcePlans.resize(_size1268);
+            uint32_t _i1272;
+            for (_i1272 = 0; _i1272 < _size1268; ++_i1272)
             {
-              xfer += this->resourcePlans[_i1264].read(iprot);
+              xfer += this->resourcePlans[_i1272].read(iprot);
             }
             xfer += iprot->readListEnd();
           }
@@ -34708,10 +34860,10 @@
     xfer += oprot->writeFieldBegin("resourcePlans", ::apache::thrift::protocol::T_LIST, 1);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->resourcePlans.size()));
-      std::vector<WMResourcePlan> ::const_iterator _iter1265;
-      for (_iter1265 = this->resourcePlans.begin(); _iter1265 != this->resourcePlans.end(); ++_iter1265)
+      std::vector<WMResourcePlan> ::const_iterator _iter1273;
+      for (_iter1273 = this->resourcePlans.begin(); _iter1273 != this->resourcePlans.end(); ++_iter1273)
       {
-        xfer += (*_iter1265).write(oprot);
+        xfer += (*_iter1273).write(oprot);
       }
       xfer += oprot->writeListEnd();
     }
@@ -34728,13 +34880,13 @@
   swap(a.__isset, b.__isset);
 }
 
-WMGetAllResourcePlanResponse::WMGetAllResourcePlanResponse(const WMGetAllResourcePlanResponse& other1266) {
-  resourcePlans = other1266.resourcePlans;
-  __isset = other1266.__isset;
+WMGetAllResourcePlanResponse::WMGetAllResourcePlanResponse(const WMGetAllResourcePlanResponse& other1274) {
+  resourcePlans = other1274.resourcePlans;
+  __isset = other1274.__isset;
 }
-WMGetAllResourcePlanResponse& WMGetAllResourcePlanResponse::operator=(const WMGetAllResourcePlanResponse& other1267) {
-  resourcePlans = other1267.resourcePlans;
-  __isset = other1267.__isset;
+WMGetAllResourcePlanResponse& WMGetAllResourcePlanResponse::operator=(const WMGetAllResourcePlanResponse& other1275) {
+  resourcePlans = other1275.resourcePlans;
+  __isset = other1275.__isset;
   return *this;
 }
 void WMGetAllResourcePlanResponse::printTo(std::ostream& out) const {
@@ -34917,23 +35069,23 @@
   swap(a.__isset, b.__isset);
 }
 
-WMAlterResourcePlanRequest::WMAlterResourcePlanRequest(const WMAlterResourcePlanRequest& other1268) {
-  resourcePlanName = other1268.resourcePlanName;
-  resourcePlan = other1268.resourcePlan;
-  isEnableAndActivate = other1268.isEnableAndActivate;
-  isForceDeactivate = other1268.isForceDeactivate;
-  isReplace = other1268.isReplace;
-  ns = other1268.ns;
-  __isset = other1268.__isset;
+WMAlterResourcePlanRequest::WMAlterResourcePlanRequest(const WMAlterResourcePlanRequest& other1276) {
+  resourcePlanName = other1276.resourcePlanName;
+  resourcePlan = other1276.resourcePlan;
+  isEnableAndActivate = other1276.isEnableAndActivate;
+  isForceDeactivate = other1276.isForceDeactivate;
+  isReplace = other1276.isReplace;
+  ns = other1276.ns;
+  __isset = other1276.__isset;
 }
-WMAlterResourcePlanRequest& WMAlterResourcePlanRequest::operator=(const WMAlterResourcePlanRequest& other1269) {
-  resourcePlanName = other1269.resourcePlanName;
-  resourcePlan = other1269.resourcePlan;
-  isEnableAndActivate = other1269.isEnableAndActivate;
-  isForceDeactivate = other1269.isForceDeactivate;
-  isReplace = other1269.isReplace;
-  ns = other1269.ns;
-  __isset = other1269.__isset;
+WMAlterResourcePlanRequest& WMAlterResourcePlanRequest::operator=(const WMAlterResourcePlanRequest& other1277) {
+  resourcePlanName = other1277.resourcePlanName;
+  resourcePlan = other1277.resourcePlan;
+  isEnableAndActivate = other1277.isEnableAndActivate;
+  isForceDeactivate = other1277.isForceDeactivate;
+  isReplace = other1277.isReplace;
+  ns = other1277.ns;
+  __isset = other1277.__isset;
   return *this;
 }
 void WMAlterResourcePlanRequest::printTo(std::ostream& out) const {
@@ -35026,13 +35178,13 @@
   swap(a.__isset, b.__isset);
 }
 
-WMAlterResourcePlanResponse::WMAlterResourcePlanResponse(const WMAlterResourcePlanResponse& other1270) {
-  fullResourcePlan = other1270.fullResourcePlan;
-  __isset = other1270.__isset;
+WMAlterResourcePlanResponse::WMAlterResourcePlanResponse(const WMAlterResourcePlanResponse& other1278) {
+  fullResourcePlan = other1278.fullResourcePlan;
+  __isset = other1278.__isset;
 }
-WMAlterResourcePlanResponse& WMAlterResourcePlanResponse::operator=(const WMAlterResourcePlanResponse& other1271) {
-  fullResourcePlan = other1271.fullResourcePlan;
-  __isset = other1271.__isset;
+WMAlterResourcePlanResponse& WMAlterResourcePlanResponse::operator=(const WMAlterResourcePlanResponse& other1279) {
+  fullResourcePlan = other1279.fullResourcePlan;
+  __isset = other1279.__isset;
   return *this;
 }
 void WMAlterResourcePlanResponse::printTo(std::ostream& out) const {
@@ -35139,15 +35291,15 @@
   swap(a.__isset, b.__isset);
 }
 
-WMValidateResourcePlanRequest::WMValidateResourcePlanRequest(const WMValidateResourcePlanRequest& other1272) {
-  resourcePlanName = other1272.resourcePlanName;
-  ns = other1272.ns;
-  __isset = other1272.__isset;
+WMValidateResourcePlanRequest::WMValidateResourcePlanRequest(const WMValidateResourcePlanRequest& other1280) {
+  resourcePlanName = other1280.resourcePlanName;
+  ns = other1280.ns;
+  __isset = other1280.__isset;
 }
-WMValidateResourcePlanRequest& WMValidateResourcePlanRequest::operator=(const WMValidateResourcePlanRequest& other1273) {
-  resourcePlanName = other1273.resourcePlanName;
-  ns = other1273.ns;
-  __isset = other1273.__isset;
+WMValidateResourcePlanRequest& WMValidateResourcePlanRequest::operator=(const WMValidateResourcePlanRequest& other1281) {
+  resourcePlanName = other1281.resourcePlanName;
+  ns = other1281.ns;
+  __isset = other1281.__isset;
   return *this;
 }
 void WMValidateResourcePlanRequest::printTo(std::ostream& out) const {
@@ -35204,14 +35356,14 @@
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->errors.clear();
-            uint32_t _size1274;
-            ::apache::thrift::protocol::TType _etype1277;
-            xfer += iprot->readListBegin(_etype1277, _size1274);
-            this->errors.resize(_size1274);
-            uint32_t _i1278;
-            for (_i1278 = 0; _i1278 < _size1274; ++_i1278)
+            uint32_t _size1282;
+            ::apache::thrift::protocol::TType _etype1285;
+            xfer += iprot->readListBegin(_etype1285, _size1282);
+            this->errors.resize(_size1282);
+            uint32_t _i1286;
+            for (_i1286 = 0; _i1286 < _size1282; ++_i1286)
             {
-              xfer += iprot->readString(this->errors[_i1278]);
+              xfer += iprot->readString(this->errors[_i1286]);
             }
             xfer += iprot->readListEnd();
           }
@@ -35224,14 +35376,14 @@
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->warnings.clear();
-            uint32_t _size1279;
-            ::apache::thrift::protocol::TType _etype1282;
-            xfer += iprot->readListBegin(_etype1282, _size1279);
-            this->warnings.resize(_size1279);
-            uint32_t _i1283;
-            for (_i1283 = 0; _i1283 < _size1279; ++_i1283)
+            uint32_t _size1287;
+            ::apache::thrift::protocol::TType _etype1290;
+            xfer += iprot->readListBegin(_etype1290, _size1287);
+            this->warnings.resize(_size1287);
+            uint32_t _i1291;
+            for (_i1291 = 0; _i1291 < _size1287; ++_i1291)
             {
-              xfer += iprot->readString(this->warnings[_i1283]);
+              xfer += iprot->readString(this->warnings[_i1291]);
             }
             xfer += iprot->readListEnd();
           }
@@ -35261,10 +35413,10 @@
     xfer += oprot->writeFieldBegin("errors", ::apache::thrift::protocol::T_LIST, 1);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->errors.size()));
-      std::vector<std::string> ::const_iterator _iter1284;
-      for (_iter1284 = this->errors.begin(); _iter1284 != this->errors.end(); ++_iter1284)
+      std::vector<std::string> ::const_iterator _iter1292;
+      for (_iter1292 = this->errors.begin(); _iter1292 != this->errors.end(); ++_iter1292)
       {
-        xfer += oprot->writeString((*_iter1284));
+        xfer += oprot->writeString((*_iter1292));
       }
       xfer += oprot->writeListEnd();
     }
@@ -35274,10 +35426,10 @@
     xfer += oprot->writeFieldBegin("warnings", ::apache::thrift::protocol::T_LIST, 2);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->warnings.size()));
-      std::vector<std::string> ::const_iterator _iter1285;
-      for (_iter1285 = this->warnings.begin(); _iter1285 != this->warnings.end(); ++_iter1285)
+      std::vector<std::string> ::const_iterator _iter1293;
+      for (_iter1293 = this->warnings.begin(); _iter1293 != this->warnings.end(); ++_iter1293)
       {
-        xfer += oprot->writeString((*_iter1285));
+        xfer += oprot->writeString((*_iter1293));
       }
       xfer += oprot->writeListEnd();
     }
@@ -35295,15 +35447,15 @@
   swap(a.__isset, b.__isset);
 }
 
-WMValidateResourcePlanResponse::WMValidateResourcePlanResponse(const WMValidateResourcePlanResponse& other1286) {
-  errors = other1286.errors;
-  warnings = other1286.warnings;
-  __isset = other1286.__isset;
+WMValidateResourcePlanResponse::WMValidateResourcePlanResponse(const WMValidateResourcePlanResponse& other1294) {
+  errors = other1294.errors;
+  warnings = other1294.warnings;
+  __isset = other1294.__isset;
 }
-WMValidateResourcePlanResponse& WMValidateResourcePlanResponse::operator=(const WMValidateResourcePlanResponse& other1287) {
-  errors = other1287.errors;
-  warnings = other1287.warnings;
-  __isset = other1287.__isset;
+WMValidateResourcePlanResponse& WMValidateResourcePlanResponse::operator=(const WMValidateResourcePlanResponse& other1295) {
+  errors = other1295.errors;
+  warnings = other1295.warnings;
+  __isset = other1295.__isset;
   return *this;
 }
 void WMValidateResourcePlanResponse::printTo(std::ostream& out) const {
@@ -35411,15 +35563,15 @@
   swap(a.__isset, b.__isset);
 }
 
-WMDropResourcePlanRequest::WMDropResourcePlanRequest(const WMDropResourcePlanRequest& other1288) {
-  resourcePlanName = other1288.resourcePlanName;
-  ns = other1288.ns;
-  __isset = other1288.__isset;
+WMDropResourcePlanRequest::WMDropResourcePlanRequest(const WMDropResourcePlanRequest& other1296) {
+  resourcePlanName = other1296.resourcePlanName;
+  ns = other1296.ns;
+  __isset = other1296.__isset;
 }
-WMDropResourcePlanRequest& WMDropResourcePlanRequest::operator=(const WMDropResourcePlanRequest& other1289) {
-  resourcePlanName = other1289.resourcePlanName;
-  ns = other1289.ns;
-  __isset = other1289.__isset;
+WMDropResourcePlanRequest& WMDropResourcePlanRequest::operator=(const WMDropResourcePlanRequest& other1297) {
+  resourcePlanName = other1297.resourcePlanName;
+  ns = other1297.ns;
+  __isset = other1297.__isset;
   return *this;
 }
 void WMDropResourcePlanRequest::printTo(std::ostream& out) const {
@@ -35485,11 +35637,11 @@
   (void) b;
 }
 
-WMDropResourcePlanResponse::WMDropResourcePlanResponse(const WMDropResourcePlanResponse& other1290) {
-  (void) other1290;
+WMDropResourcePlanResponse::WMDropResourcePlanResponse(const WMDropResourcePlanResponse& other1298) {
+  (void) other1298;
 }
-WMDropResourcePlanResponse& WMDropResourcePlanResponse::operator=(const WMDropResourcePlanResponse& other1291) {
-  (void) other1291;
+WMDropResourcePlanResponse& WMDropResourcePlanResponse::operator=(const WMDropResourcePlanResponse& other1299) {
+  (void) other1299;
   return *this;
 }
 void WMDropResourcePlanResponse::printTo(std::ostream& out) const {
@@ -35576,13 +35728,13 @@
   swap(a.__isset, b.__isset);
 }
 
-WMCreateTriggerRequest::WMCreateTriggerRequest(const WMCreateTriggerRequest& other1292) {
-  trigger = other1292.trigger;
-  __isset = other1292.__isset;
+WMCreateTriggerRequest::WMCreateTriggerRequest(const WMCreateTriggerRequest& other1300) {
+  trigger = other1300.trigger;
+  __isset = other1300.__isset;
 }
-WMCreateTriggerRequest& WMCreateTriggerRequest::operator=(const WMCreateTriggerRequest& other1293) {
-  trigger = other1293.trigger;
-  __isset = other1293.__isset;
+WMCreateTriggerRequest& WMCreateTriggerRequest::operator=(const WMCreateTriggerRequest& other1301) {
+  trigger = other1301.trigger;
+  __isset = other1301.__isset;
   return *this;
 }
 void WMCreateTriggerRequest::printTo(std::ostream& out) const {
@@ -35647,11 +35799,11 @@
   (void) b;
 }
 
-WMCreateTriggerResponse::WMCreateTriggerResponse(const WMCreateTriggerResponse& other1294) {
-  (void) other1294;
+WMCreateTriggerResponse::WMCreateTriggerResponse(const WMCreateTriggerResponse& other1302) {
+  (void) other1302;
 }
-WMCreateTriggerResponse& WMCreateTriggerResponse::operator=(const WMCreateTriggerResponse& other1295) {
-  (void) other1295;
+WMCreateTriggerResponse& WMCreateTriggerResponse::operator=(const WMCreateTriggerResponse& other1303) {
+  (void) other1303;
   return *this;
 }
 void WMCreateTriggerResponse::printTo(std::ostream& out) const {
@@ -35738,13 +35890,13 @@
   swap(a.__isset, b.__isset);
 }
 
-WMAlterTriggerRequest::WMAlterTriggerRequest(const WMAlterTriggerRequest& other1296) {
-  trigger = other1296.trigger;
-  __isset = other1296.__isset;
+WMAlterTriggerRequest::WMAlterTriggerRequest(const WMAlterTriggerRequest& other1304) {
+  trigger = other1304.trigger;
+  __isset = other1304.__isset;
 }
-WMAlterTriggerRequest& WMAlterTriggerRequest::operator=(const WMAlterTriggerRequest& other1297) {
-  trigger = other1297.trigger;
-  __isset = other1297.__isset;
+WMAlterTriggerRequest& WMAlterTriggerRequest::operator=(const WMAlterTriggerRequest& other1305) {
+  trigger = other1305.trigger;
+  __isset = other1305.__isset;
   return *this;
 }
 void WMAlterTriggerRequest::printTo(std::ostream& out) const {
@@ -35809,11 +35961,11 @@
   (void) b;
 }
 
-WMAlterTriggerResponse::WMAlterTriggerResponse(const WMAlterTriggerResponse& other1298) {
-  (void) other1298;
+WMAlterTriggerResponse::WMAlterTriggerResponse(const WMAlterTriggerResponse& other1306) {
+  (void) other1306;
 }
-WMAlterTriggerResponse& WMAlterTriggerResponse::operator=(const WMAlterTriggerResponse& other1299) {
-  (void) other1299;
+WMAlterTriggerResponse& WMAlterTriggerResponse::operator=(const WMAlterTriggerResponse& other1307) {
+  (void) other1307;
   return *this;
 }
 void WMAlterTriggerResponse::printTo(std::ostream& out) const {
@@ -35938,17 +36090,17 @@
   swap(a.__isset, b.__isset);
 }
 
-WMDropTriggerRequest::WMDropTriggerRequest(const WMDropTriggerRequest& other1300) {
-  resourcePlanName = other1300.resourcePlanName;
-  triggerName = other1300.triggerName;
-  ns = other1300.ns;
-  __isset = other1300.__isset;
+WMDropTriggerRequest::WMDropTriggerRequest(const WMDropTriggerRequest& other1308) {
+  resourcePlanName = other1308.resourcePlanName;
+  triggerName = other1308.triggerName;
+  ns = other1308.ns;
+  __isset = other1308.__isset;
 }
-WMDropTriggerRequest& WMDropTriggerRequest::operator=(const WMDropTriggerRequest& other1301) {
-  resourcePlanName = other1301.resourcePlanName;
-  triggerName = other1301.triggerName;
-  ns = other1301.ns;
-  __isset = other1301.__isset;
+WMDropTriggerRequest& WMDropTriggerRequest::operator=(const WMDropTriggerRequest& other1309) {
+  resourcePlanName = other1309.resourcePlanName;
+  triggerName = other1309.triggerName;
+  ns = other1309.ns;
+  __isset = other1309.__isset;
   return *this;
 }
 void WMDropTriggerRequest::printTo(std::ostream& out) const {
@@ -36015,11 +36167,11 @@
   (void) b;
 }
 
-WMDropTriggerResponse::WMDropTriggerResponse(const WMDropTriggerResponse& other1302) {
-  (void) other1302;
+WMDropTriggerResponse::WMDropTriggerResponse(const WMDropTriggerResponse& other1310) {
+  (void) other1310;
 }
-WMDropTriggerResponse& WMDropTriggerResponse::operator=(const WMDropTriggerResponse& other1303) {
-  (void) other1303;
+WMDropTriggerResponse& WMDropTriggerResponse::operator=(const WMDropTriggerResponse& other1311) {
+  (void) other1311;
   return *this;
 }
 void WMDropTriggerResponse::printTo(std::ostream& out) const {
@@ -36125,15 +36277,15 @@
   swap(a.__isset, b.__isset);
 }
 
-WMGetTriggersForResourePlanRequest::WMGetTriggersForResourePlanRequest(const WMGetTriggersForResourePlanRequest& other1304) {
-  resourcePlanName = other1304.resourcePlanName;
-  ns = other1304.ns;
-  __isset = other1304.__isset;
+WMGetTriggersForResourePlanRequest::WMGetTriggersForResourePlanRequest(const WMGetTriggersForResourePlanRequest& other1312) {
+  resourcePlanName = other1312.resourcePlanName;
+  ns = other1312.ns;
+  __isset = other1312.__isset;
 }
-WMGetTriggersForResourePlanRequest& WMGetTriggersForResourePlanRequest::operator=(const WMGetTriggersForResourePlanRequest& other1305) {
-  resourcePlanName = other1305.resourcePlanName;
-  ns = other1305.ns;
-  __isset = other1305.__isset;
+WMGetTriggersForResourePlanRequest& WMGetTriggersForResourePlanRequest::operator=(const WMGetTriggersForResourePlanRequest& other1313) {
+  resourcePlanName = other1313.resourcePlanName;
+  ns = other1313.ns;
+  __isset = other1313.__isset;
   return *this;
 }
 void WMGetTriggersForResourePlanRequest::printTo(std::ostream& out) const {
@@ -36185,14 +36337,14 @@
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->triggers.clear();
-            uint32_t _size1306;
-            ::apache::thrift::protocol::TType _etype1309;
-            xfer += iprot->readListBegin(_etype1309, _size1306);
-            this->triggers.resize(_size1306);
-            uint32_t _i1310;
-            for (_i1310 = 0; _i1310 < _size1306; ++_i1310)
+            uint32_t _size1314;
+            ::apache::thrift::protocol::TType _etype1317;
+            xfer += iprot->readListBegin(_etype1317, _size1314);
+            this->triggers.resize(_size1314);
+            uint32_t _i1318;
+            for (_i1318 = 0; _i1318 < _size1314; ++_i1318)
             {
-              xfer += this->triggers[_i1310].read(iprot);
+              xfer += this->triggers[_i1318].read(iprot);
             }
             xfer += iprot->readListEnd();
           }
@@ -36222,10 +36374,10 @@
     xfer += oprot->writeFieldBegin("triggers", ::apache::thrift::protocol::T_LIST, 1);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->triggers.size()));
-      std::vector<WMTrigger> ::const_iterator _iter1311;
-      for (_iter1311 = this->triggers.begin(); _iter1311 != this->triggers.end(); ++_iter1311)
+      std::vector<WMTrigger> ::const_iterator _iter1319;
+      for (_iter1319 = this->triggers.begin(); _iter1319 != this->triggers.end(); ++_iter1319)
       {
-        xfer += (*_iter1311).write(oprot);
+        xfer += (*_iter1319).write(oprot);
       }
       xfer += oprot->writeListEnd();
     }
@@ -36242,13 +36394,13 @@
   swap(a.__isset, b.__isset);
 }
 
-WMGetTriggersForResourePlanResponse::WMGetTriggersForResourePlanResponse(const WMGetTriggersForResourePlanResponse& other1312) {
-  triggers = other1312.triggers;
-  __isset = other1312.__isset;
+WMGetTriggersForResourePlanResponse::WMGetTriggersForResourePlanResponse(const WMGetTriggersForResourePlanResponse& other1320) {
+  triggers = other1320.triggers;
+  __isset = other1320.__isset;
 }
-WMGetTriggersForResourePlanResponse& WMGetTriggersForResourePlanResponse::operator=(const WMGetTriggersForResourePlanResponse& other1313) {
-  triggers = other1313.triggers;
-  __isset = other1313.__isset;
+WMGetTriggersForResourePlanResponse& WMGetTriggersForResourePlanResponse::operator=(const WMGetTriggersForResourePlanResponse& other1321) {
+  triggers = other1321.triggers;
+  __isset = other1321.__isset;
   return *this;
 }
 void WMGetTriggersForResourePlanResponse::printTo(std::ostream& out) const {
@@ -36336,13 +36488,13 @@
   swap(a.__isset, b.__isset);
 }
 
-WMCreatePoolRequest::WMCreatePoolRequest(const WMCreatePoolRequest& other1314) {
-  pool = other1314.pool;
-  __isset = other1314.__isset;
+WMCreatePoolRequest::WMCreatePoolRequest(const WMCreatePoolRequest& other1322) {
+  pool = other1322.pool;
+  __isset = other1322.__isset;
 }
-WMCreatePoolRequest& WMCreatePoolRequest::operator=(const WMCreatePoolRequest& other1315) {
-  pool = other1315.pool;
-  __isset = other1315.__isset;
+WMCreatePoolRequest& WMCreatePoolRequest::operator=(const WMCreatePoolRequest& other1323) {
+  pool = other1323.pool;
+  __isset = other1323.__isset;
   return *this;
 }
 void WMCreatePoolRequest::printTo(std::ostream& out) const {
@@ -36407,11 +36559,11 @@
   (void) b;
 }
 
-WMCreatePoolResponse::WMCreatePoolResponse(const WMCreatePoolResponse& other1316) {
-  (void) other1316;
+WMCreatePoolResponse::WMCreatePoolResponse(const WMCreatePoolResponse& other1324) {
+  (void) other1324;
 }
-WMCreatePoolResponse& WMCreatePoolResponse::operator=(const WMCreatePoolResponse& other1317) {
-  (void) other1317;
+WMCreatePoolResponse& WMCreatePoolResponse::operator=(const WMCreatePoolResponse& other1325) {
+  (void) other1325;
   return *this;
 }
 void WMCreatePoolResponse::printTo(std::ostream& out) const {
@@ -36517,15 +36669,15 @@
   swap(a.__isset, b.__isset);
 }
 
-WMAlterPoolRequest::WMAlterPoolRequest(const WMAlterPoolRequest& other1318) {
-  pool = other1318.pool;
-  poolPath = other1318.poolPath;
-  __isset = other1318.__isset;
+WMAlterPoolRequest::WMAlterPoolRequest(const WMAlterPoolRequest& other1326) {
+  pool = other1326.pool;
+  poolPath = other1326.poolPath;
+  __isset = other1326.__isset;
 }
-WMAlterPoolRequest& WMAlterPoolRequest::operator=(const WMAlterPoolRequest& other1319) {
-  pool = other1319.pool;
-  poolPath = other1319.poolPath;
-  __isset = other1319.__isset;
+WMAlterPoolRequest& WMAlterPoolRequest::operator=(const WMAlterPoolRequest& other1327) {
+  pool = other1327.pool;
+  poolPath = other1327.poolPath;
+  __isset = other1327.__isset;
   return *this;
 }
 void WMAlterPoolRequest::printTo(std::ostream& out) const {
@@ -36591,11 +36743,11 @@
   (void) b;
 }
 
-WMAlterPoolResponse::WMAlterPoolResponse(const WMAlterPoolResponse& other1320) {
-  (void) other1320;
+WMAlterPoolResponse::WMAlterPoolResponse(const WMAlterPoolResponse& other1328) {
+  (void) other1328;
 }
-WMAlterPoolResponse& WMAlterPoolResponse::operator=(const WMAlterPoolResponse& other1321) {
-  (void) other1321;
+WMAlterPoolResponse& WMAlterPoolResponse::operator=(const WMAlterPoolResponse& other1329) {
+  (void) other1329;
   return *this;
 }
 void WMAlterPoolResponse::printTo(std::ostream& out) const {
@@ -36720,17 +36872,17 @@
   swap(a.__isset, b.__isset);
 }
 
-WMDropPoolRequest::WMDropPoolRequest(const WMDropPoolRequest& other1322) {
-  resourcePlanName = other1322.resourcePlanName;
-  poolPath = other1322.poolPath;
-  ns = other1322.ns;
-  __isset = other1322.__isset;
+WMDropPoolRequest::WMDropPoolRequest(const WMDropPoolRequest& other1330) {
+  resourcePlanName = other1330.resourcePlanName;
+  poolPath = other1330.poolPath;
+  ns = other1330.ns;
+  __isset = other1330.__isset;
 }
-WMDropPoolRequest& WMDropPoolRequest::operator=(const WMDropPoolRequest& other1323) {
-  resourcePlanName = other1323.resourcePlanName;
-  poolPath = other1323.poolPath;
-  ns = other1323.ns;
-  __isset = other1323.__isset;
+WMDropPoolRequest& WMDropPoolRequest::operator=(const WMDropPoolRequest& other1331) {
+  resourcePlanName = other1331.resourcePlanName;
+  poolPath = other1331.poolPath;
+  ns = other1331.ns;
+  __isset = other1331.__isset;
   return *this;
 }
 void WMDropPoolRequest::printTo(std::ostream& out) const {
@@ -36797,11 +36949,11 @@
   (void) b;
 }
 
-WMDropPoolResponse::WMDropPoolResponse(const WMDropPoolResponse& other1324) {
-  (void) other1324;
+WMDropPoolResponse::WMDropPoolResponse(const WMDropPoolResponse& other1332) {
+  (void) other1332;
 }
-WMDropPoolResponse& WMDropPoolResponse::operator=(const WMDropPoolResponse& other1325) {
-  (void) other1325;
+WMDropPoolResponse& WMDropPoolResponse::operator=(const WMDropPoolResponse& other1333) {
+  (void) other1333;
   return *this;
 }
 void WMDropPoolResponse::printTo(std::ostream& out) const {
@@ -36907,15 +37059,15 @@
   swap(a.__isset, b.__isset);
 }
 
-WMCreateOrUpdateMappingRequest::WMCreateOrUpdateMappingRequest(const WMCreateOrUpdateMappingRequest& other1326) {
-  mapping = other1326.mapping;
-  update = other1326.update;
-  __isset = other1326.__isset;
+WMCreateOrUpdateMappingRequest::WMCreateOrUpdateMappingRequest(const WMCreateOrUpdateMappingRequest& other1334) {
+  mapping = other1334.mapping;
+  update = other1334.update;
+  __isset = other1334.__isset;
 }
-WMCreateOrUpdateMappingRequest& WMCreateOrUpdateMappingRequest::operator=(const WMCreateOrUpdateMappingRequest& other1327) {
-  mapping = other1327.mapping;
-  update = other1327.update;
-  __isset = other1327.__isset;
+WMCreateOrUpdateMappingRequest& WMCreateOrUpdateMappingRequest::operator=(const WMCreateOrUpdateMappingRequest& other1335) {
+  mapping = other1335.mapping;
+  update = other1335.update;
+  __isset = other1335.__isset;
   return *this;
 }
 void WMCreateOrUpdateMappingRequest::printTo(std::ostream& out) const {
@@ -36981,11 +37133,11 @@
   (void) b;
 }
 
-WMCreateOrUpdateMappingResponse::WMCreateOrUpdateMappingResponse(const WMCreateOrUpdateMappingResponse& other1328) {
-  (void) other1328;
+WMCreateOrUpdateMappingResponse::WMCreateOrUpdateMappingResponse(const WMCreateOrUpdateMappingResponse& other1336) {
+  (void) other1336;
 }
-WMCreateOrUpdateMappingResponse& WMCreateOrUpdateMappingResponse::operator=(const WMCreateOrUpdateMappingResponse& other1329) {
-  (void) other1329;
+WMCreateOrUpdateMappingResponse& WMCreateOrUpdateMappingResponse::operator=(const WMCreateOrUpdateMappingResponse& other1337) {
+  (void) other1337;
   return *this;
 }
 void WMCreateOrUpdateMappingResponse::printTo(std::ostream& out) const {
@@ -37072,13 +37224,13 @@
   swap(a.__isset, b.__isset);
 }
 
-WMDropMappingRequest::WMDropMappingRequest(const WMDropMappingRequest& other1330) {
-  mapping = other1330.mapping;
-  __isset = other1330.__isset;
+WMDropMappingRequest::WMDropMappingRequest(const WMDropMappingRequest& other1338) {
+  mapping = other1338.mapping;
+  __isset = other1338.__isset;
 }
-WMDropMappingRequest& WMDropMappingRequest::operator=(const WMDropMappingRequest& other1331) {
-  mapping = other1331.mapping;
-  __isset = other1331.__isset;
+WMDropMappingRequest& WMDropMappingRequest::operator=(const WMDropMappingRequest& other1339) {
+  mapping = other1339.mapping;
+  __isset = other1339.__isset;
   return *this;
 }
 void WMDropMappingRequest::printTo(std::ostream& out) const {
@@ -37143,11 +37295,11 @@
   (void) b;
 }
 
-WMDropMappingResponse::WMDropMappingResponse(const WMDropMappingResponse& other1332) {
-  (void) other1332;
+WMDropMappingResponse::WMDropMappingResponse(const WMDropMappingResponse& other1340) {
+  (void) other1340;
 }
-WMDropMappingResponse& WMDropMappingResponse::operator=(const WMDropMappingResponse& other1333) {
-  (void) other1333;
+WMDropMappingResponse& WMDropMappingResponse::operator=(const WMDropMappingResponse& other1341) {
+  (void) other1341;
   return *this;
 }
 void WMDropMappingResponse::printTo(std::ostream& out) const {
@@ -37310,21 +37462,21 @@
   swap(a.__isset, b.__isset);
 }
 
-WMCreateOrDropTriggerToPoolMappingRequest::WMCreateOrDropTriggerToPoolMappingRequest(const WMCreateOrDropTriggerToPoolMappingRequest& other1334) {
-  resourcePlanName = other1334.resourcePlanName;
-  triggerName = other1334.triggerName;
-  poolPath = other1334.poolPath;
-  drop = other1334.drop;
-  ns = other1334.ns;
-  __isset = other1334.__isset;
+WMCreateOrDropTriggerToPoolMappingRequest::WMCreateOrDropTriggerToPoolMappingRequest(const WMCreateOrDropTriggerToPoolMappingRequest& other1342) {
+  resourcePlanName = other1342.resourcePlanName;
+  triggerName = other1342.triggerName;
+  poolPath = other1342.poolPath;
+  drop = other1342.drop;
+  ns = other1342.ns;
+  __isset = other1342.__isset;
 }
-WMCreateOrDropTriggerToPoolMappingRequest& WMCreateOrDropTriggerToPoolMappingRequest::operator=(const WMCreateOrDropTriggerToPoolMappingRequest& other1335) {
-  resourcePlanName = other1335.resourcePlanName;
-  triggerName = other1335.triggerName;
-  poolPath = other1335.poolPath;
-  drop = other1335.drop;
-  ns = other1335.ns;
-  __isset = other1335.__isset;
+WMCreateOrDropTriggerToPoolMappingRequest& WMCreateOrDropTriggerToPoolMappingRequest::operator=(const WMCreateOrDropTriggerToPoolMappingRequest& other1343) {
+  resourcePlanName = other1343.resourcePlanName;
+  triggerName = other1343.triggerName;
+  poolPath = other1343.poolPath;
+  drop = other1343.drop;
+  ns = other1343.ns;
+  __isset = other1343.__isset;
   return *this;
 }
 void WMCreateOrDropTriggerToPoolMappingRequest::printTo(std::ostream& out) const {
@@ -37393,11 +37545,11 @@
   (void) b;
 }
 
-WMCreateOrDropTriggerToPoolMappingResponse::WMCreateOrDropTriggerToPoolMappingResponse(const WMCreateOrDropTriggerToPoolMappingResponse& other1336) {
-  (void) other1336;
+WMCreateOrDropTriggerToPoolMappingResponse::WMCreateOrDropTriggerToPoolMappingResponse(const WMCreateOrDropTriggerToPoolMappingResponse& other1344) {
+  (void) other1344;
 }
-WMCreateOrDropTriggerToPoolMappingResponse& WMCreateOrDropTriggerToPoolMappingResponse::operator=(const WMCreateOrDropTriggerToPoolMappingResponse& other1337) {
-  (void) other1337;
+WMCreateOrDropTriggerToPoolMappingResponse& WMCreateOrDropTriggerToPoolMappingResponse::operator=(const WMCreateOrDropTriggerToPoolMappingResponse& other1345) {
+  (void) other1345;
   return *this;
 }
 void WMCreateOrDropTriggerToPoolMappingResponse::printTo(std::ostream& out) const {
@@ -37478,9 +37630,9 @@
     {
       case 1:
         if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast1338;
-          xfer += iprot->readI32(ecast1338);
-          this->schemaType = (SchemaType::type)ecast1338;
+          int32_t ecast1346;
+          xfer += iprot->readI32(ecast1346);
+          this->schemaType = (SchemaType::type)ecast1346;
           this->__isset.schemaType = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -37512,9 +37664,9 @@
         break;
       case 5:
         if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast1339;
-          xfer += iprot->readI32(ecast1339);
-          this->compatibility = (SchemaCompatibility::type)ecast1339;
+          int32_t ecast1347;
+          xfer += iprot->readI32(ecast1347);
+          this->compatibility = (SchemaCompatibility::type)ecast1347;
           this->__isset.compatibility = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -37522,9 +37674,9 @@
         break;
       case 6:
         if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast1340;
-          xfer += iprot->readI32(ecast1340);
-          this->validationLevel = (SchemaValidation::type)ecast1340;
+          int32_t ecast1348;
+          xfer += iprot->readI32(ecast1348);
+          this->validationLevel = (SchemaValidation::type)ecast1348;
           this->__isset.validationLevel = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -37628,29 +37780,29 @@
   swap(a.__isset, b.__isset);
 }
 
-ISchema::ISchema(const ISchema& other1341) {
-  schemaType = other1341.schemaType;
-  name = other1341.name;
-  catName = other1341.catName;
-  dbName = other1341.dbName;
-  compatibility = other1341.compatibility;
-  validationLevel = other1341.validationLevel;
-  canEvolve = other1341.canEvolve;
-  schemaGroup = other1341.schemaGroup;
-  description = other1341.description;
-  __isset = other1341.__isset;
+ISchema::ISchema(const ISchema& other1349) {
+  schemaType = other1349.schemaType;
+  name = other1349.name;
+  catName = other1349.catName;
+  dbName = other1349.dbName;
+  compatibility = other1349.compatibility;
+  validationLevel = other1349.validationLevel;
+  canEvolve = other1349.canEvolve;
+  schemaGroup = other1349.schemaGroup;
+  description = other1349.description;
+  __isset = other1349.__isset;
 }
-ISchema& ISchema::operator=(const ISchema& other1342) {
-  schemaType = other1342.schemaType;
-  name = other1342.name;
-  catName = other1342.catName;
-  dbName = other1342.dbName;
-  compatibility = other1342.compatibility;
-  validationLevel = other1342.validationLevel;
-  canEvolve = other1342.canEvolve;
-  schemaGroup = other1342.schemaGroup;
-  description = other1342.description;
-  __isset = other1342.__isset;
+ISchema& ISchema::operator=(const ISchema& other1350) {
+  schemaType = other1350.schemaType;
+  name = other1350.name;
+  catName = other1350.catName;
+  dbName = other1350.dbName;
+  compatibility = other1350.compatibility;
+  validationLevel = other1350.validationLevel;
+  canEvolve = other1350.canEvolve;
+  schemaGroup = other1350.schemaGroup;
+  description = other1350.description;
+  __isset = other1350.__isset;
   return *this;
 }
 void ISchema::printTo(std::ostream& out) const {
@@ -37778,17 +37930,17 @@
   swap(a.__isset, b.__isset);
 }
 
-ISchemaName::ISchemaName(const ISchemaName& other1343) {
-  catName = other1343.catName;
-  dbName = other1343.dbName;
-  schemaName = other1343.schemaName;
-  __isset = other1343.__isset;
+ISchemaName::ISchemaName(const ISchemaName& other1351) {
+  catName = other1351.catName;
+  dbName = other1351.dbName;
+  schemaName = other1351.schemaName;
+  __isset = other1351.__isset;
 }
-ISchemaName& ISchemaName::operator=(const ISchemaName& other1344) {
-  catName = other1344.catName;
-  dbName = other1344.dbName;
-  schemaName = other1344.schemaName;
-  __isset = other1344.__isset;
+ISchemaName& ISchemaName::operator=(const ISchemaName& other1352) {
+  catName = other1352.catName;
+  dbName = other1352.dbName;
+  schemaName = other1352.schemaName;
+  __isset = other1352.__isset;
   return *this;
 }
 void ISchemaName::printTo(std::ostream& out) const {
@@ -37893,15 +38045,15 @@
   swap(a.__isset, b.__isset);
 }
 
-AlterISchemaRequest::AlterISchemaRequest(const AlterISchemaRequest& other1345) {
-  name = other1345.name;
-  newSchema = other1345.newSchema;
-  __isset = other1345.__isset;
+AlterISchemaRequest::AlterISchemaRequest(const AlterISchemaRequest& other1353) {
+  name = other1353.name;
+  newSchema = other1353.newSchema;
+  __isset = other1353.__isset;
 }
-AlterISchemaRequest& AlterISchemaRequest::operator=(const AlterISchemaRequest& other1346) {
-  name = other1346.name;
-  newSchema = other1346.newSchema;
-  __isset = other1346.__isset;
+AlterISchemaRequest& AlterISchemaRequest::operator=(const AlterISchemaRequest& other1354) {
+  name = other1354.name;
+  newSchema = other1354.newSchema;
+  __isset = other1354.__isset;
   return *this;
 }
 void AlterISchemaRequest::printTo(std::ostream& out) const {
@@ -38018,14 +38170,14 @@
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->cols.clear();
-            uint32_t _size1347;
-            ::apache::thrift::protocol::TType _etype1350;
-            xfer += iprot->readListBegin(_etype1350, _size1347);
-            this->cols.resize(_size1347);
-            uint32_t _i1351;
-            for (_i1351 = 0; _i1351 < _size1347; ++_i1351)
+            uint32_t _size1355;
+            ::apache::thrift::protocol::TType _etype1358;
+            xfer += iprot->readListBegin(_etype1358, _size1355);
+            this->cols.resize(_size1355);
+            uint32_t _i1359;
+            for (_i1359 = 0; _i1359 < _size1355; ++_i1359)
             {
-              xfer += this->cols[_i1351].read(iprot);
+              xfer += this->cols[_i1359].read(iprot);
             }
             xfer += iprot->readListEnd();
           }
@@ -38036,9 +38188,9 @@
         break;
       case 5:
         if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast1352;
-          xfer += iprot->readI32(ecast1352);
-          this->state = (SchemaVersionState::type)ecast1352;
+          int32_t ecast1360;
+          xfer += iprot->readI32(ecast1360);
+          this->state = (SchemaVersionState::type)ecast1360;
           this->__isset.state = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -38116,10 +38268,10 @@
   xfer += oprot->writeFieldBegin("cols", ::apache::thrift::protocol::T_LIST, 4);
   {
     xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->cols.size()));
-    std::vector<FieldSchema> ::const_iterator _iter1353;
-    for (_iter1353 = this->cols.begin(); _iter1353 != this->cols.end(); ++_iter1353)
+    std::vector<FieldSchema> ::const_iterator _iter1361;
+    for (_iter1361 = this->cols.begin(); _iter1361 != this->cols.end(); ++_iter1361)
     {
-      xfer += (*_iter1353).write(oprot);
+      xfer += (*_iter1361).write(oprot);
     }
     xfer += oprot->writeListEnd();
   }
@@ -38175,31 +38327,31 @@
   swap(a.__isset, b.__isset);
 }
 
-SchemaVersion::SchemaVersion(const SchemaVersion& other1354) {
-  schema = other1354.schema;
-  version = other1354.version;
-  createdAt = other1354.createdAt;
-  cols = other1354.cols;
-  state = other1354.state;
-  description = other1354.description;
-  schemaText = other1354.schemaText;
-  fingerprint = other1354.fingerprint;
-  name = other1354.name;
-  serDe = other1354.serDe;
-  __isset = other1354.__isset;
+SchemaVersion::SchemaVersion(const SchemaVersion& other1362) {
+  schema = other1362.schema;
+  version = other1362.version;
+  createdAt = other1362.createdAt;
+  cols = other1362.cols;
+  state = other1362.state;
+  description = other1362.description;
+  schemaText = other1362.schemaText;
+  fingerprint = other1362.fingerprint;
+  name = other1362.name;
+  serDe = other1362.serDe;
+  __isset = other1362.__isset;
 }
-SchemaVersion& SchemaVersion::operator=(const SchemaVersion& other1355) {
-  schema = other1355.schema;
-  version = other1355.version;
-  createdAt = other1355.createdAt;
-  cols = other1355.cols;
-  state = other1355.state;
-  description = other1355.description;
-  schemaText = other1355.schemaText;
-  fingerprint = other1355.fingerprint;
-  name = other1355.name;
-  serDe = other1355.serDe;
-  __isset = other1355.__isset;
+SchemaVersion& SchemaVersion::operator=(const SchemaVersion& other1363) {
+  schema = other1363.schema;
+  version = other1363.version;
+  createdAt = other1363.createdAt;
+  cols = other1363.cols;
+  state = other1363.state;
+  description = other1363.description;
+  schemaText = other1363.schemaText;
+  fingerprint = other1363.fingerprint;
+  name = other1363.name;
+  serDe = other1363.serDe;
+  __isset = other1363.__isset;
   return *this;
 }
 void SchemaVersion::printTo(std::ostream& out) const {
@@ -38311,15 +38463,15 @@
   swap(a.__isset, b.__isset);
 }
 
-SchemaVersionDescriptor::SchemaVersionDescriptor(const SchemaVersionDescriptor& other1356) {
-  schema = other1356.schema;
-  version = other1356.version;
-  __isset = other1356.__isset;
+SchemaVersionDescriptor::SchemaVersionDescriptor(const SchemaVersionDescriptor& other1364) {
+  schema = other1364.schema;
+  version = other1364.version;
+  __isset = other1364.__isset;
 }
-SchemaVersionDescriptor& SchemaVersionDescriptor::operator=(const SchemaVersionDescriptor& other1357) {
-  schema = other1357.schema;
-  version = other1357.version;
-  __isset = other1357.__isset;
+SchemaVersionDescriptor& SchemaVersionDescriptor::operator=(const SchemaVersionDescriptor& other1365) {
+  schema = other1365.schema;
+  version = other1365.version;
+  __isset = other1365.__isset;
   return *this;
 }
 void SchemaVersionDescriptor::printTo(std::ostream& out) const {
@@ -38446,17 +38598,17 @@
   swap(a.__isset, b.__isset);
 }
 
-FindSchemasByColsRqst::FindSchemasByColsRqst(const FindSchemasByColsRqst& other1358) {
-  colName = other1358.colName;
-  colNamespace = other1358.colNamespace;
-  type = other1358.type;
-  __isset = other1358.__isset;
+FindSchemasByColsRqst::FindSchemasByColsRqst(const FindSchemasByColsRqst& other1366) {
+  colName = other1366.colName;
+  colNamespace = other1366.colNamespace;
+  type = other1366.type;
+  __isset = other1366.__isset;
 }
-FindSchemasByColsRqst& FindSchemasByColsRqst::operator=(const FindSchemasByColsRqst& other1359) {
-  colName = other1359.colName;
-  colNamespace = other1359.colNamespace;
-  type = other1359.type;
-  __isset = other1359.__isset;
+FindSchemasByColsRqst& FindSchemasByColsRqst::operator=(const FindSchemasByColsRqst& other1367) {
+  colName = other1367.colName;
+  colNamespace = other1367.colNamespace;
+  type = other1367.type;
+  __isset = other1367.__isset;
   return *this;
 }
 void FindSchemasByColsRqst::printTo(std::ostream& out) const {
@@ -38508,14 +38660,14 @@
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->schemaVersions.clear();
-            uint32_t _size1360;
-            ::apache::thrift::protocol::TType _etype1363;
-            xfer += iprot->readListBegin(_etype1363, _size1360);
-            this->schemaVersions.resize(_size1360);
-            uint32_t _i1364;
-            for (_i1364 = 0; _i1364 < _size1360; ++_i1364)
+            uint32_t _size1368;
+            ::apache::thrift::protocol::TType _etype1371;
+            xfer += iprot->readListBegin(_etype1371, _size1368);
+            this->schemaVersions.resize(_size1368);
+            uint32_t _i1372;
+            for (_i1372 = 0; _i1372 < _size1368; ++_i1372)
             {
-              xfer += this->schemaVersions[_i1364].read(iprot);
+              xfer += this->schemaVersions[_i1372].read(iprot);
             }
             xfer += iprot->readListEnd();
           }
@@ -38544,10 +38696,10 @@
   xfer += oprot->writeFieldBegin("schemaVersions", ::apache::thrift::protocol::T_LIST, 1);
   {
     xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->schemaVersions.size()));
-    std::vector<SchemaVersionDescriptor> ::const_iterator _iter1365;
-    for (_iter1365 = this->schemaVersions.begin(); _iter1365 != this->schemaVersions.end(); ++_iter1365)
+    std::vector<SchemaVersionDescriptor> ::const_iterator _iter1373;
+    for (_iter1373 = this->schemaVersions.begin(); _iter1373 != this->schemaVersions.end(); ++_iter1373)
     {
-      xfer += (*_iter1365).write(oprot);
+      xfer += (*_iter1373).write(oprot);
     }
     xfer += oprot->writeListEnd();
   }
@@ -38564,13 +38716,13 @@
   swap(a.__isset, b.__isset);
 }
 
-FindSchemasByColsResp::FindSchemasByColsResp(const FindSchemasByColsResp& other1366) {
-  schemaVersions = other1366.schemaVersions;
-  __isset = other1366.__isset;
+FindSchemasByColsResp::FindSchemasByColsResp(const FindSchemasByColsResp& other1374) {
+  schemaVersions = other1374.schemaVersions;
+  __isset = other1374.__isset;
 }
-FindSchemasByColsResp& FindSchemasByColsResp::operator=(const FindSchemasByColsResp& other1367) {
-  schemaVersions = other1367.schemaVersions;
-  __isset = other1367.__isset;
+FindSchemasByColsResp& FindSchemasByColsResp::operator=(const FindSchemasByColsResp& other1375) {
+  schemaVersions = other1375.schemaVersions;
+  __isset = other1375.__isset;
   return *this;
 }
 void FindSchemasByColsResp::printTo(std::ostream& out) const {
@@ -38673,15 +38825,15 @@
   swap(a.__isset, b.__isset);
 }
 
-MapSchemaVersionToSerdeRequest::MapSchemaVersionToSerdeRequest(const MapSchemaVersionToSerdeRequest& other1368) {
-  schemaVersion = other1368.schemaVersion;
-  serdeName = other1368.serdeName;
-  __isset = other1368.__isset;
+MapSchemaVersionToSerdeRequest::MapSchemaVersionToSerdeRequest(const MapSchemaVersionToSerdeRequest& other1376) {
+  schemaVersion = other1376.schemaVersion;
+  serdeName = other1376.serdeName;
+  __isset = other1376.__isset;
 }
-MapSchemaVersionToSerdeRequest& MapSchemaVersionToSerdeRequest::operator=(const MapSchemaVersionToSerdeRequest& other1369) {
-  schemaVersion = other1369.schemaVersion;
-  serdeName = other1369.serdeName;
-  __isset = other1369.__isset;
+MapSchemaVersionToSerdeRequest& MapSchemaVersionToSerdeRequest::operator=(const MapSchemaVersionToSerdeRequest& other1377) {
+  schemaVersion = other1377.schemaVersion;
+  serdeName = other1377.serdeName;
+  __isset = other1377.__isset;
   return *this;
 }
 void MapSchemaVersionToSerdeRequest::printTo(std::ostream& out) const {
@@ -38742,9 +38894,9 @@
         break;
       case 2:
         if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast1370;
-          xfer += iprot->readI32(ecast1370);
-          this->state = (SchemaVersionState::type)ecast1370;
+          int32_t ecast1378;
+          xfer += iprot->readI32(ecast1378);
+          this->state = (SchemaVersionState::type)ecast1378;
           this->__isset.state = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -38787,15 +38939,15 @@
   swap(a.__isset, b.__isset);
 }
 
-SetSchemaVersionStateRequest::SetSchemaVersionStateRequest(const SetSchemaVersionStateRequest& other1371) {
-  schemaVersion = other1371.schemaVersion;
-  state = other1371.state;
-  __isset = other1371.__isset;
+SetSchemaVersionStateRequest::SetSchemaVersionStateRequest(const SetSchemaVersionStateRequest& other1379) {
+  schemaVersion = other1379.schemaVersion;
+  state = other1379.state;
+  __isset = other1379.__isset;
 }
-SetSchemaVersionStateRequest& SetSchemaVersionStateRequest::operator=(const SetSchemaVersionStateRequest& other1372) {
-  schemaVersion = other1372.schemaVersion;
-  state = other1372.state;
-  __isset = other1372.__isset;
+SetSchemaVersionStateRequest& SetSchemaVersionStateRequest::operator=(const SetSchemaVersionStateRequest& other1380) {
+  schemaVersion = other1380.schemaVersion;
+  state = other1380.state;
+  __isset = other1380.__isset;
   return *this;
 }
 void SetSchemaVersionStateRequest::printTo(std::ostream& out) const {
@@ -38882,13 +39034,13 @@
   swap(a.__isset, b.__isset);
 }
 
-GetSerdeRequest::GetSerdeRequest(const GetSerdeRequest& other1373) {
-  serdeName = other1373.serdeName;
-  __isset = other1373.__isset;
+GetSerdeRequest::GetSerdeRequest(const GetSerdeRequest& other1381) {
+  serdeName = other1381.serdeName;
+  __isset = other1381.__isset;
 }
-GetSerdeRequest& GetSerdeRequest::operator=(const GetSerdeRequest& other1374) {
-  serdeName = other1374.serdeName;
-  __isset = other1374.__isset;
+GetSerdeRequest& GetSerdeRequest::operator=(const GetSerdeRequest& other1382) {
+  serdeName = other1382.serdeName;
+  __isset = other1382.__isset;
   return *this;
 }
 void GetSerdeRequest::printTo(std::ostream& out) const {
@@ -39016,17 +39168,17 @@
   swap(a.__isset, b.__isset);
 }
 
-RuntimeStat::RuntimeStat(const RuntimeStat& other1375) {
-  createTime = other1375.createTime;
-  weight = other1375.weight;
-  payload = other1375.payload;
-  __isset = other1375.__isset;
+RuntimeStat::RuntimeStat(const RuntimeStat& other1383) {
+  createTime = other1383.createTime;
+  weight = other1383.weight;
+  payload = other1383.payload;
+  __isset = other1383.__isset;
 }
-RuntimeStat& RuntimeStat::operator=(const RuntimeStat& other1376) {
-  createTime = other1376.createTime;
-  weight = other1376.weight;
-  payload = other1376.payload;
-  __isset = other1376.__isset;
+RuntimeStat& RuntimeStat::operator=(const RuntimeStat& other1384) {
+  createTime = other1384.createTime;
+  weight = other1384.weight;
+  payload = other1384.payload;
+  __isset = other1384.__isset;
   return *this;
 }
 void RuntimeStat::printTo(std::ostream& out) const {
@@ -39136,13 +39288,13 @@
   swap(a.maxCreateTime, b.maxCreateTime);
 }
 
-GetRuntimeStatsRequest::GetRuntimeStatsRequest(const GetRuntimeStatsRequest& other1377) {
-  maxWeight = other1377.maxWeight;
-  maxCreateTime = other1377.maxCreateTime;
+GetRuntimeStatsRequest::GetRuntimeStatsRequest(const GetRuntimeStatsRequest& other1385) {
+  maxWeight = other1385.maxWeight;
+  maxCreateTime = other1385.maxCreateTime;
 }
-GetRuntimeStatsRequest& GetRuntimeStatsRequest::operator=(const GetRuntimeStatsRequest& other1378) {
-  maxWeight = other1378.maxWeight;
-  maxCreateTime = other1378.maxCreateTime;
+GetRuntimeStatsRequest& GetRuntimeStatsRequest::operator=(const GetRuntimeStatsRequest& other1386) {
+  maxWeight = other1386.maxWeight;
+  maxCreateTime = other1386.maxCreateTime;
   return *this;
 }
 void GetRuntimeStatsRequest::printTo(std::ostream& out) const {
@@ -39255,14 +39407,14 @@
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->primaryKeys.clear();
-            uint32_t _size1379;
-            ::apache::thrift::protocol::TType _etype1382;
-            xfer += iprot->readListBegin(_etype1382, _size1379);
-            this->primaryKeys.resize(_size1379);
-            uint32_t _i1383;
-            for (_i1383 = 0; _i1383 < _size1379; ++_i1383)
+            uint32_t _size1387;
+            ::apache::thrift::protocol::TType _etype1390;
+            xfer += iprot->readListBegin(_etype1390, _size1387);
+            this->primaryKeys.resize(_size1387);
+            uint32_t _i1391;
+            for (_i1391 = 0; _i1391 < _size1387; ++_i1391)
             {
-              xfer += this->primaryKeys[_i1383].read(iprot);
+              xfer += this->primaryKeys[_i1391].read(iprot);
             }
             xfer += iprot->readListEnd();
           }
@@ -39275,14 +39427,14 @@
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->foreignKeys.clear();
-            uint32_t _size1384;
-            ::apache::thrift::protocol::TType _etype1387;
-            xfer += iprot->readListBegin(_etype1387, _size1384);
-            this->foreignKeys.resize(_size1384);
-            uint32_t _i1388;
-            for (_i1388 = 0; _i1388 < _size1384; ++_i1388)
+            uint32_t _size1392;
+            ::apache::thrift::protocol::TType _etype1395;
+            xfer += iprot->readListBegin(_etype1395, _size1392);
+            this->foreignKeys.resize(_size1392);
+            uint32_t _i1396;
+            for (_i1396 = 0; _i1396 < _size1392; ++_i1396)
             {
-              xfer += this->foreignKeys[_i1388].read(iprot);
+              xfer += this->foreignKeys[_i1396].read(iprot);
             }
             xfer += iprot->readListEnd();
           }
@@ -39295,14 +39447,14 @@
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->uniqueConstraints.clear();
-            uint32_t _size1389;
-            ::apache::thrift::protocol::TType _etype1392;
-            xfer += iprot->readListBegin(_etype1392, _size1389);
-            this->uniqueConstraints.resize(_size1389);
-            uint32_t _i1393;
-            for (_i1393 = 0; _i1393 < _size1389; ++_i1393)
+            uint32_t _size1397;
+            ::apache::thrift::protocol::TType _etype1400;
+            xfer += iprot->readListBegin(_etype1400, _size1397);
+            this->uniqueConstraints.resize(_size1397);
+            uint32_t _i1401;
+            for (_i1401 = 0; _i1401 < _size1397; ++_i1401)
             {
-              xfer += this->uniqueConstraints[_i1393].read(iprot);
+              xfer += this->uniqueConstraints[_i1401].read(iprot);
             }
             xfer += iprot->readListEnd();
           }
@@ -39315,14 +39467,14 @@
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->notNullConstraints.clear();
-            uint32_t _size1394;
-            ::apache::thrift::protocol::TType _etype1397;
-            xfer += iprot->readListBegin(_etype1397, _size1394);
-            this->notNullConstraints.resize(_size1394);
-            uint32_t _i1398;
-            for (_i1398 = 0; _i1398 < _size1394; ++_i1398)
+            uint32_t _size1402;
+            ::apache::thrift::protocol::TType _etype1405;
+            xfer += iprot->readListBegin(_etype1405, _size1402);
+            this->notNullConstraints.resize(_size1402);
+            uint32_t _i1406;
+            for (_i1406 = 0; _i1406 < _size1402; ++_i1406)
             {
-              xfer += this->notNullConstraints[_i1398].read(iprot);
+              xfer += this->notNullConstraints[_i1406].read(iprot);
             }
             xfer += iprot->readListEnd();
           }
@@ -39335,14 +39487,14 @@
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->defaultConstraints.clear();
-            uint32_t _size1399;
-            ::apache::thrift::protocol::TType _etype1402;
-            xfer += iprot->readListBegin(_etype1402, _size1399);
-            this->defaultConstraints.resize(_size1399);
-            uint32_t _i1403;
-            for (_i1403 = 0; _i1403 < _size1399; ++_i1403)
+            uint32_t _size1407;
+            ::apache::thrift::protocol::TType _etype1410;
+            xfer += iprot->readListBegin(_etype1410, _size1407);
+            this->defaultConstraints.resize(_size1407);
+            uint32_t _i1411;
+            for (_i1411 = 0; _i1411 < _size1407; ++_i1411)
             {
-              xfer += this->defaultConstraints[_i1403].read(iprot);
+              xfer += this->defaultConstraints[_i1411].read(iprot);
             }
             xfer += iprot->readListEnd();
           }
@@ -39355,14 +39507,14 @@
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->checkConstraints.clear();
-            uint32_t _size1404;
-            ::apache::thrift::protocol::TType _etype1407;
-            xfer += iprot->readListBegin(_etype1407, _size1404);
-            this->checkConstraints.resize(_size1404);
-            uint32_t _i1408;
-            for (_i1408 = 0; _i1408 < _size1404; ++_i1408)
+            uint32_t _size1412;
+            ::apache::thrift::protocol::TType _etype1415;
+            xfer += iprot->readListBegin(_etype1415, _size1412);
+            this->checkConstraints.resize(_size1412);
+            uint32_t _i1416;
+            for (_i1416 = 0; _i1416 < _size1412; ++_i1416)
             {
-              xfer += this->checkConstraints[_i1408].read(iprot);
+              xfer += this->checkConstraints[_i1416].read(iprot);
             }
             xfer += iprot->readListEnd();
           }
@@ -39375,14 +39527,14 @@
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->processorCapabilities.clear();
-            uint32_t _size1409;
-            ::apache::thrift::protocol::TType _etype1412;
-            xfer += iprot->readListBegin(_etype1412, _size1409);
-            this->processorCapabilities.resize(_size1409);
-            uint32_t _i1413;
-            for (_i1413 = 0; _i1413 < _size1409; ++_i1413)
+            uint32_t _size1417;
+            ::apache::thrift::protocol::TType _etype1420;
+            xfer += iprot->readListBegin(_etype1420, _size1417);
+            this->processorCapabilities.resize(_size1417);
+            uint32_t _i1421;
+            for (_i1421 = 0; _i1421 < _size1417; ++_i1421)
             {
-              xfer += iprot->readString(this->processorCapabilities[_i1413]);
+              xfer += iprot->readString(this->processorCapabilities[_i1421]);
             }
             xfer += iprot->readListEnd();
           }
@@ -39431,10 +39583,10 @@
     xfer += oprot->writeFieldBegin("primaryKeys", ::apache::thrift::protocol::T_LIST, 3);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->primaryKeys.size()));
-      std::vector<SQLPrimaryKey> ::const_iterator _iter1414;
-      for (_iter1414 = this->primaryKeys.begin(); _iter1414 != this->primaryKeys.end(); ++_iter1414)
+      std::vector<SQLPrimaryKey> ::const_iterator _iter1422;
+      for (_iter1422 = this->primaryKeys.begin(); _iter1422 != this->primaryKeys.end(); ++_iter1422)
       {
-        xfer += (*_iter1414).write(oprot);
+        xfer += (*_iter1422).write(oprot);
       }
       xfer += oprot->writeListEnd();
     }
@@ -39444,10 +39596,10 @@
     xfer += oprot->writeFieldBegin("foreignKeys", ::apache::thrift::protocol::T_LIST, 4);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->foreignKeys.size()));
-      std::vector<SQLForeignKey> ::const_iterator _iter1415;
-      for (_iter1415 = this->foreignKeys.begin(); _iter1415 != this->foreignKeys.end(); ++_iter1415)
+      std::vector<SQLForeignKey> ::const_iterator _iter1423;
+      for (_iter1423 = this->foreignKeys.begin(); _iter1423 != this->foreignKeys.end(); ++_iter1423)
       {
-        xfer += (*_iter1415).write(oprot);
+        xfer += (*_iter1423).write(oprot);
       }
       xfer += oprot->writeListEnd();
     }
@@ -39457,10 +39609,10 @@
     xfer += oprot->writeFieldBegin("uniqueConstraints", ::apache::thrift::protocol::T_LIST, 5);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->uniqueConstraints.size()));
-      std::vector<SQLUniqueConstraint> ::const_iterator _iter1416;
-      for (_iter1416 = this->uniqueConstraints.begin(); _iter1416 != this->uniqueConstraints.end(); ++_iter1416)
+      std::vector<SQLUniqueConstraint> ::const_iterator _iter1424;
+      for (_iter1424 = this->uniqueConstraints.begin(); _iter1424 != this->uniqueConstraints.end(); ++_iter1424)
       {
-        xfer += (*_iter1416).write(oprot);
+        xfer += (*_iter1424).write(oprot);
       }
       xfer += oprot->writeListEnd();
     }
@@ -39470,10 +39622,10 @@
     xfer += oprot->writeFieldBegin("notNullConstraints", ::apache::thrift::protocol::T_LIST, 6);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->notNullConstraints.size()));
-      std::vector<SQLNotNullConstraint> ::const_iterator _iter1417;
-      for (_iter1417 = this->notNullConstraints.begin(); _iter1417 != this->notNullConstraints.end(); ++_iter1417)
+      std::vector<SQLNotNullConstraint> ::const_iterator _iter1425;
+      for (_iter1425 = this->notNullConstraints.begin(); _iter1425 != this->notNullConstraints.end(); ++_iter1425)
       {
-        xfer += (*_iter1417).write(oprot);
+        xfer += (*_iter1425).write(oprot);
       }
       xfer += oprot->writeListEnd();
     }
@@ -39483,10 +39635,10 @@
     xfer += oprot->writeFieldBegin("defaultConstraints", ::apache::thrift::protocol::T_LIST, 7);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->defaultConstraints.size()));
-      std::vector<SQLDefaultConstraint> ::const_iterator _iter1418;
-      for (_iter1418 = this->defaultConstraints.begin(); _iter1418 != this->defaultConstraints.end(); ++_iter1418)
+      std::vector<SQLDefaultConstraint> ::const_iterator _iter1426;
+      for (_iter1426 = this->defaultConstraints.begin(); _iter1426 != this->defaultConstraints.end(); ++_iter1426)
       {
-        xfer += (*_iter1418).write(oprot);
+        xfer += (*_iter1426).write(oprot);
       }
       xfer += oprot->writeListEnd();
     }
@@ -39496,10 +39648,10 @@
     xfer += oprot->writeFieldBegin("checkConstraints", ::apache::thrift::protocol::T_LIST, 8);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->checkConstraints.size()));
-      std::vector<SQLCheckConstraint> ::const_iterator _iter1419;
-      for (_iter1419 = this->checkConstraints.begin(); _iter1419 != this->checkConstraints.end(); ++_iter1419)
+      std::vector<SQLCheckConstraint> ::const_iterator _iter1427;
+      for (_iter1427 = this->checkConstraints.begin(); _iter1427 != this->checkConstraints.end(); ++_iter1427)
       {
-        xfer += (*_iter1419).write(oprot);
+        xfer += (*_iter1427).write(oprot);
       }
       xfer += oprot->writeListEnd();
     }
@@ -39509,10 +39661,10 @@
     xfer += oprot->writeFieldBegin("processorCapabilities", ::apache::thrift::protocol::T_LIST, 9);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->processorCapabilities.size()));
-      std::vector<std::string> ::const_iterator _iter1420;
-      for (_iter1420 = this->processorCapabilities.begin(); _iter1420 != this->processorCapabilities.end(); ++_iter1420)
+      std::vector<std::string> ::const_iterator _iter1428;
+      for (_iter1428 = this->processorCapabilities.begin(); _iter1428 != this->processorCapabilities.end(); ++_iter1428)
       {
-        xfer += oprot->writeString((*_iter1420));
+        xfer += oprot->writeString((*_iter1428));
       }
       xfer += oprot->writeListEnd();
     }
@@ -39543,31 +39695,31 @@
   swap(a.__isset, b.__isset);
 }
 
-CreateTableRequest::CreateTableRequest(const CreateTableRequest& other1421) {
-  table = other1421.table;
-  envContext = other1421.envContext;
-  primaryKeys = other1421.primaryKeys;
-  foreignKeys = other1421.foreignKeys;
-  uniqueConstraints = other1421.uniqueConstraints;
-  notNullConstraints = other1421.notNullConstraints;
-  defaultConstraints = other1421.defaultConstraints;
-  checkConstraints = other1421.checkConstraints;
-  processorCapabilities = other1421.processorCapabilities;
-  processorIdentifier = other1421.processorIdentifier;
-  __isset = other1421.__isset;
+CreateTableRequest::CreateTableRequest(const CreateTableRequest& other1429) {
+  table = other1429.table;
+  envContext = other1429.envContext;
+  primaryKeys = other1429.primaryKeys;
+  foreignKeys = other1429.foreignKeys;
+  uniqueConstraints = other1429.uniqueConstraints;
+  notNullConstraints = other1429.notNullConstraints;
+  defaultConstraints = other1429.defaultConstraints;
+  checkConstraints = other1429.checkConstraints;
+  processorCapabilities = other1429.processorCapabilities;
+  processorIdentifier = other1429.processorIdentifier;
+  __isset = other1429.__isset;
 }
-CreateTableRequest& CreateTableRequest::operator=(const CreateTableRequest& other1422) {
-  table = other1422.table;
-  envContext = other1422.envContext;
-  primaryKeys = other1422.primaryKeys;
-  foreignKeys = other1422.foreignKeys;
-  uniqueConstraints = other1422.uniqueConstraints;
-  notNullConstraints = other1422.notNullConstraints;
-  defaultConstraints = other1422.defaultConstraints;
-  checkConstraints = other1422.checkConstraints;
-  processorCapabilities = other1422.processorCapabilities;
-  processorIdentifier = other1422.processorIdentifier;
-  __isset = other1422.__isset;
+CreateTableRequest& CreateTableRequest::operator=(const CreateTableRequest& other1430) {
+  table = other1430.table;
+  envContext = other1430.envContext;
+  primaryKeys = other1430.primaryKeys;
+  foreignKeys = other1430.foreignKeys;
+  uniqueConstraints = other1430.uniqueConstraints;
+  notNullConstraints = other1430.notNullConstraints;
+  defaultConstraints = other1430.defaultConstraints;
+  checkConstraints = other1430.checkConstraints;
+  processorCapabilities = other1430.processorCapabilities;
+  processorIdentifier = other1430.processorIdentifier;
+  __isset = other1430.__isset;
   return *this;
 }
 void CreateTableRequest::printTo(std::ostream& out) const {
@@ -39664,11 +39816,11 @@
   swap(a.clusterNamespace, b.clusterNamespace);
 }
 
-ScheduledQueryPollRequest::ScheduledQueryPollRequest(const ScheduledQueryPollRequest& other1423) {
-  clusterNamespace = other1423.clusterNamespace;
+ScheduledQueryPollRequest::ScheduledQueryPollRequest(const ScheduledQueryPollRequest& other1431) {
+  clusterNamespace = other1431.clusterNamespace;
 }
-ScheduledQueryPollRequest& ScheduledQueryPollRequest::operator=(const ScheduledQueryPollRequest& other1424) {
-  clusterNamespace = other1424.clusterNamespace;
+ScheduledQueryPollRequest& ScheduledQueryPollRequest::operator=(const ScheduledQueryPollRequest& other1432) {
+  clusterNamespace = other1432.clusterNamespace;
   return *this;
 }
 void ScheduledQueryPollRequest::printTo(std::ostream& out) const {
@@ -39776,13 +39928,13 @@
   swap(a.clusterNamespace, b.clusterNamespace);
 }
 
-ScheduledQueryKey::ScheduledQueryKey(const ScheduledQueryKey& other1425) {
-  scheduleName = other1425.scheduleName;
-  clusterNamespace = other1425.clusterNamespace;
+ScheduledQueryKey::ScheduledQueryKey(const ScheduledQueryKey& other1433) {
+  scheduleName = other1433.scheduleName;
+  clusterNamespace = other1433.clusterNamespace;
 }
-ScheduledQueryKey& ScheduledQueryKey::operator=(const ScheduledQueryKey& other1426) {
-  scheduleName = other1426.scheduleName;
-  clusterNamespace = other1426.clusterNamespace;
+ScheduledQueryKey& ScheduledQueryKey::operator=(const ScheduledQueryKey& other1434) {
+  scheduleName = other1434.scheduleName;
+  clusterNamespace = other1434.clusterNamespace;
   return *this;
 }
 void ScheduledQueryKey::printTo(std::ostream& out) const {
@@ -39928,19 +40080,19 @@
   swap(a.__isset, b.__isset);
 }
 
-ScheduledQueryPollResponse::ScheduledQueryPollResponse(const ScheduledQueryPollResponse& other1427) {
-  scheduleKey = other1427.scheduleKey;
-  executionId = other1427.executionId;
-  query = other1427.query;
-  user = other1427.user;
-  __isset = other1427.__isset;
+ScheduledQueryPollResponse::ScheduledQueryPollResponse(const ScheduledQueryPollResponse& other1435) {
+  scheduleKey = other1435.scheduleKey;
+  executionId = other1435.executionId;
+  query = other1435.query;
+  user = other1435.user;
+  __isset = other1435.__isset;
 }
-ScheduledQueryPollResponse& ScheduledQueryPollResponse::operator=(const ScheduledQueryPollResponse& other1428) {
-  scheduleKey = other1428.scheduleKey;
-  executionId = other1428.executionId;
-  query = other1428.query;
-  user = other1428.user;
-  __isset = other1428.__isset;
+ScheduledQueryPollResponse& ScheduledQueryPollResponse::operator=(const ScheduledQueryPollResponse& other1436) {
+  scheduleKey = other1436.scheduleKey;
+  executionId = other1436.executionId;
+  query = other1436.query;
+  user = other1436.user;
+  __isset = other1436.__isset;
   return *this;
 }
 void ScheduledQueryPollResponse::printTo(std::ostream& out) const {
@@ -40127,23 +40279,23 @@
   swap(a.__isset, b.__isset);
 }
 
-ScheduledQuery::ScheduledQuery(const ScheduledQuery& other1429) {
-  scheduleKey = other1429.scheduleKey;
-  enabled = other1429.enabled;
-  schedule = other1429.schedule;
-  user = other1429.user;
-  query = other1429.query;
-  nextExecution = other1429.nextExecution;
-  __isset = other1429.__isset;
+ScheduledQuery::ScheduledQuery(const ScheduledQuery& other1437) {
+  scheduleKey = other1437.scheduleKey;
+  enabled = other1437.enabled;
+  schedule = other1437.schedule;
+  user = other1437.user;
+  query = other1437.query;
+  nextExecution = other1437.nextExecution;
+  __isset = other1437.__isset;
 }
-ScheduledQuery& ScheduledQuery::operator=(const ScheduledQuery& other1430) {
-  scheduleKey = other1430.scheduleKey;
-  enabled = other1430.enabled;
-  schedule = other1430.schedule;
-  user = other1430.user;
-  query = other1430.query;
-  nextExecution = other1430.nextExecution;
-  __isset = other1430.__isset;
+ScheduledQuery& ScheduledQuery::operator=(const ScheduledQuery& other1438) {
+  scheduleKey = other1438.scheduleKey;
+  enabled = other1438.enabled;
+  schedule = other1438.schedule;
+  user = other1438.user;
+  query = other1438.query;
+  nextExecution = other1438.nextExecution;
+  __isset = other1438.__isset;
   return *this;
 }
 void ScheduledQuery::printTo(std::ostream& out) const {
@@ -40202,9 +40354,9 @@
     {
       case 1:
         if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast1431;
-          xfer += iprot->readI32(ecast1431);
-          this->type = (ScheduledQueryMaintenanceRequestType::type)ecast1431;
+          int32_t ecast1439;
+          xfer += iprot->readI32(ecast1439);
+          this->type = (ScheduledQueryMaintenanceRequestType::type)ecast1439;
           isset_type = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -40258,13 +40410,13 @@
   swap(a.scheduledQuery, b.scheduledQuery);
 }
 
-ScheduledQueryMaintenanceRequest::ScheduledQueryMaintenanceRequest(const ScheduledQueryMaintenanceRequest& other1432) {
-  type = other1432.type;
-  scheduledQuery = other1432.scheduledQuery;
+ScheduledQueryMaintenanceRequest::ScheduledQueryMaintenanceRequest(const ScheduledQueryMaintenanceRequest& other1440) {
+  type = other1440.type;
+  scheduledQuery = other1440.scheduledQuery;
 }
-ScheduledQueryMaintenanceRequest& ScheduledQueryMaintenanceRequest::operator=(const ScheduledQueryMaintenanceRequest& other1433) {
-  type = other1433.type;
-  scheduledQuery = other1433.scheduledQuery;
+ScheduledQueryMaintenanceRequest& ScheduledQueryMaintenanceRequest::operator=(const ScheduledQueryMaintenanceRequest& other1441) {
+  type = other1441.type;
+  scheduledQuery = other1441.scheduledQuery;
   return *this;
 }
 void ScheduledQueryMaintenanceRequest::printTo(std::ostream& out) const {
@@ -40337,9 +40489,9 @@
         break;
       case 2:
         if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast1434;
-          xfer += iprot->readI32(ecast1434);
-          this->state = (QueryState::type)ecast1434;
+          int32_t ecast1442;
+          xfer += iprot->readI32(ecast1442);
+          this->state = (QueryState::type)ecast1442;
           isset_state = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -40415,19 +40567,19 @@
   swap(a.__isset, b.__isset);
 }
 
-ScheduledQueryProgressInfo::ScheduledQueryProgressInfo(const ScheduledQueryProgressInfo& other1435) {
-  scheduledExecutionId = other1435.scheduledExecutionId;
-  state = other1435.state;
-  executorQueryId = other1435.executorQueryId;
-  errorMessage = other1435.errorMessage;
-  __isset = other1435.__isset;
+ScheduledQueryProgressInfo::ScheduledQueryProgressInfo(const ScheduledQueryProgressInfo& other1443) {
+  scheduledExecutionId = other1443.scheduledExecutionId;
+  state = other1443.state;
+  executorQueryId = other1443.executorQueryId;
+  errorMessage = other1443.errorMessage;
+  __isset = other1443.__isset;
 }
-ScheduledQueryProgressInfo& ScheduledQueryProgressInfo::operator=(const ScheduledQueryProgressInfo& other1436) {
-  scheduledExecutionId = other1436.scheduledExecutionId;
-  state = other1436.state;
-  executorQueryId = other1436.executorQueryId;
-  errorMessage = other1436.errorMessage;
-  __isset = other1436.__isset;
+ScheduledQueryProgressInfo& ScheduledQueryProgressInfo::operator=(const ScheduledQueryProgressInfo& other1444) {
+  scheduledExecutionId = other1444.scheduledExecutionId;
+  state = other1444.state;
+  executorQueryId = other1444.executorQueryId;
+  errorMessage = other1444.errorMessage;
+  __isset = other1444.__isset;
   return *this;
 }
 void ScheduledQueryProgressInfo::printTo(std::ostream& out) const {
@@ -40535,14 +40687,14 @@
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->partitions.clear();
-            uint32_t _size1437;
-            ::apache::thrift::protocol::TType _etype1440;
-            xfer += iprot->readListBegin(_etype1440, _size1437);
-            this->partitions.resize(_size1437);
-            uint32_t _i1441;
-            for (_i1441 = 0; _i1441 < _size1437; ++_i1441)
+            uint32_t _size1445;
+            ::apache::thrift::protocol::TType _etype1448;
+            xfer += iprot->readListBegin(_etype1448, _size1445);
+            this->partitions.resize(_size1445);
+            uint32_t _i1449;
+            for (_i1449 = 0; _i1449 < _size1445; ++_i1449)
             {
-              xfer += this->partitions[_i1441].read(iprot);
+              xfer += this->partitions[_i1449].read(iprot);
             }
             xfer += iprot->readListEnd();
           }
@@ -40614,10 +40766,10 @@
   xfer += oprot->writeFieldBegin("partitions", ::apache::thrift::protocol::T_LIST, 4);
   {
     xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->partitions.size()));
-    std::vector<Partition> ::const_iterator _iter1442;
-    for (_iter1442 = this->partitions.begin(); _iter1442 != this->partitions.end(); ++_iter1442)
+    std::vector<Partition> ::const_iterator _iter1450;
+    for (_iter1450 = this->partitions.begin(); _iter1450 != this->partitions.end(); ++_iter1450)
     {
-      xfer += (*_iter1442).write(oprot);
+      xfer += (*_iter1450).write(oprot);
     }
     xfer += oprot->writeListEnd();
   }
@@ -40655,25 +40807,25 @@
   swap(a.__isset, b.__isset);
 }
 
-AlterPartitionsRequest::AlterPartitionsRequest(const AlterPartitionsRequest& other1443) {
-  catName = other1443.catName;
-  dbName = other1443.dbName;
-  tableName = other1443.tableName;
-  partitions = other1443.partitions;
-  environmentContext = other1443.environmentContext;
-  writeId = other1443.writeId;
-  validWriteIdList = other1443.validWriteIdList;
-  __isset = other1443.__isset;
+AlterPartitionsRequest::AlterPartitionsRequest(const AlterPartitionsRequest& other1451) {
+  catName = other1451.catName;
+  dbName = other1451.dbName;
+  tableName = other1451.tableName;
+  partitions = other1451.partitions;
+  environmentContext = other1451.environmentContext;
+  writeId = other1451.writeId;
+  validWriteIdList = other1451.validWriteIdList;
+  __isset = other1451.__isset;
 }
-AlterPartitionsRequest& AlterPartitionsRequest::operator=(const AlterPartitionsRequest& other1444) {
-  catName = other1444.catName;
-  dbName = other1444.dbName;
-  tableName = other1444.tableName;
-  partitions = other1444.partitions;
-  environmentContext = other1444.environmentContext;
-  writeId = other1444.writeId;
-  validWriteIdList = other1444.validWriteIdList;
-  __isset = other1444.__isset;
+AlterPartitionsRequest& AlterPartitionsRequest::operator=(const AlterPartitionsRequest& other1452) {
+  catName = other1452.catName;
+  dbName = other1452.dbName;
+  tableName = other1452.tableName;
+  partitions = other1452.partitions;
+  environmentContext = other1452.environmentContext;
+  writeId = other1452.writeId;
+  validWriteIdList = other1452.validWriteIdList;
+  __isset = other1452.__isset;
   return *this;
 }
 void AlterPartitionsRequest::printTo(std::ostream& out) const {
@@ -40744,11 +40896,11 @@
   (void) b;
 }
 
-AlterPartitionsResponse::AlterPartitionsResponse(const AlterPartitionsResponse& other1445) {
-  (void) other1445;
+AlterPartitionsResponse::AlterPartitionsResponse(const AlterPartitionsResponse& other1453) {
+  (void) other1453;
 }
-AlterPartitionsResponse& AlterPartitionsResponse::operator=(const AlterPartitionsResponse& other1446) {
-  (void) other1446;
+AlterPartitionsResponse& AlterPartitionsResponse::operator=(const AlterPartitionsResponse& other1454) {
+  (void) other1454;
   return *this;
 }
 void AlterPartitionsResponse::printTo(std::ostream& out) const {
@@ -40847,14 +40999,14 @@
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->partVals.clear();
-            uint32_t _size1447;
-            ::apache::thrift::protocol::TType _etype1450;
-            xfer += iprot->readListBegin(_etype1450, _size1447);
-            this->partVals.resize(_size1447);
-            uint32_t _i1451;
-            for (_i1451 = 0; _i1451 < _size1447; ++_i1451)
+            uint32_t _size1455;
+            ::apache::thrift::protocol::TType _etype1458;
+            xfer += iprot->readListBegin(_etype1458, _size1455);
+            this->partVals.resize(_size1455);
+            uint32_t _i1459;
+            for (_i1459 = 0; _i1459 < _size1455; ++_i1459)
             {
-              xfer += iprot->readString(this->partVals[_i1451]);
+              xfer += iprot->readString(this->partVals[_i1459]);
             }
             xfer += iprot->readListEnd();
           }
@@ -40920,10 +41072,10 @@
   xfer += oprot->writeFieldBegin("partVals", ::apache::thrift::protocol::T_LIST, 4);
   {
     xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->partVals.size()));
-    std::vector<std::string> ::const_iterator _iter1452;
-    for (_iter1452 = this->partVals.begin(); _iter1452 != this->partVals.end(); ++_iter1452)
+    std::vector<std::string> ::const_iterator _iter1460;
+    for (_iter1460 = this->partVals.begin(); _iter1460 != this->partVals.end(); ++_iter1460)
     {
-      xfer += oprot->writeString((*_iter1452));
+      xfer += oprot->writeString((*_iter1460));
     }
     xfer += oprot->writeListEnd();
   }
@@ -40954,23 +41106,23 @@
   swap(a.__isset, b.__isset);
 }
 
-RenamePartitionRequest::RenamePartitionRequest(const RenamePartitionRequest& other1453) {
-  catName = other1453.catName;
-  dbName = other1453.dbName;
-  tableName = other1453.tableName;
-  partVals = other1453.partVals;
-  newPart = other1453.newPart;
-  validWriteIdList = other1453.validWriteIdList;
-  __isset = other1453.__isset;
+RenamePartitionRequest::RenamePartitionRequest(const RenamePartitionRequest& other1461) {
+  catName = other1461.catName;
+  dbName = other1461.dbName;
+  tableName = other1461.tableName;
+  partVals = other1461.partVals;
+  newPart = other1461.newPart;
+  validWriteIdList = other1461.validWriteIdList;
+  __isset = other1461.__isset;
 }
-RenamePartitionRequest& RenamePartitionRequest::operator=(const RenamePartitionRequest& other1454) {
-  catName = other1454.catName;
-  dbName = other1454.dbName;
-  tableName = other1454.tableName;
-  partVals = other1454.partVals;
-  newPart = other1454.newPart;
-  validWriteIdList = other1454.validWriteIdList;
-  __isset = other1454.__isset;
+RenamePartitionRequest& RenamePartitionRequest::operator=(const RenamePartitionRequest& other1462) {
+  catName = other1462.catName;
+  dbName = other1462.dbName;
+  tableName = other1462.tableName;
+  partVals = other1462.partVals;
+  newPart = other1462.newPart;
+  validWriteIdList = other1462.validWriteIdList;
+  __isset = other1462.__isset;
   return *this;
 }
 void RenamePartitionRequest::printTo(std::ostream& out) const {
@@ -41040,11 +41192,11 @@
   (void) b;
 }
 
-RenamePartitionResponse::RenamePartitionResponse(const RenamePartitionResponse& other1455) {
-  (void) other1455;
+RenamePartitionResponse::RenamePartitionResponse(const RenamePartitionResponse& other1463) {
+  (void) other1463;
 }
-RenamePartitionResponse& RenamePartitionResponse::operator=(const RenamePartitionResponse& other1456) {
-  (void) other1456;
+RenamePartitionResponse& RenamePartitionResponse::operator=(const RenamePartitionResponse& other1464) {
+  (void) other1464;
   return *this;
 }
 void RenamePartitionResponse::printTo(std::ostream& out) const {
@@ -41190,14 +41342,14 @@
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->processorCapabilities.clear();
-            uint32_t _size1457;
-            ::apache::thrift::protocol::TType _etype1460;
-            xfer += iprot->readListBegin(_etype1460, _size1457);
-            this->processorCapabilities.resize(_size1457);
-            uint32_t _i1461;
-            for (_i1461 = 0; _i1461 < _size1457; ++_i1461)
+            uint32_t _size1465;
+            ::apache::thrift::protocol::TType _etype1468;
+            xfer += iprot->readListBegin(_etype1468, _size1465);
+            this->processorCapabilities.resize(_size1465);
+            uint32_t _i1469;
+            for (_i1469 = 0; _i1469 < _size1465; ++_i1469)
             {
-              xfer += iprot->readString(this->processorCapabilities[_i1461]);
+              xfer += iprot->readString(this->processorCapabilities[_i1469]);
             }
             xfer += iprot->readListEnd();
           }
@@ -41273,10 +41425,10 @@
     xfer += oprot->writeFieldBegin("processorCapabilities", ::apache::thrift::protocol::T_LIST, 8);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->processorCapabilities.size()));
-      std::vector<std::string> ::const_iterator _iter1462;
-      for (_iter1462 = this->processorCapabilities.begin(); _iter1462 != this->processorCapabilities.end(); ++_iter1462)
+      std::vector<std::string> ::const_iterator _iter1470;
+      for (_iter1470 = this->processorCapabilities.begin(); _iter1470 != this->processorCapabilities.end(); ++_iter1470)
       {
-        xfer += oprot->writeString((*_iter1462));
+        xfer += oprot->writeString((*_iter1470));
       }
       xfer += oprot->writeListEnd();
     }
@@ -41306,29 +41458,29 @@
   swap(a.__isset, b.__isset);
 }
 
-AlterTableRequest::AlterTableRequest(const AlterTableRequest& other1463) {
-  catName = other1463.catName;
-  dbName = other1463.dbName;
-  tableName = other1463.tableName;
-  table = other1463.table;
-  environmentContext = other1463.environmentContext;
-  writeId = other1463.writeId;
-  validWriteIdList = other1463.validWriteIdList;
-  processorCapabilities = other1463.processorCapabilities;
-  processorIdentifier = other1463.processorIdentifier;
-  __isset = other1463.__isset;
+AlterTableRequest::AlterTableRequest(const AlterTableRequest& other1471) {
+  catName = other1471.catName;
+  dbName = other1471.dbName;
+  tableName = other1471.tableName;
+  table = other1471.table;
+  environmentContext = other1471.environmentContext;
+  writeId = other1471.writeId;
+  validWriteIdList = other1471.validWriteIdList;
+  processorCapabilities = other1471.processorCapabilities;
+  processorIdentifier = other1471.processorIdentifier;
+  __isset = other1471.__isset;
 }
-AlterTableRequest& AlterTableRequest::operator=(const AlterTableRequest& other1464) {
-  catName = other1464.catName;
-  dbName = other1464.dbName;
-  tableName = other1464.tableName;
-  table = other1464.table;
-  environmentContext = other1464.environmentContext;
-  writeId = other1464.writeId;
-  validWriteIdList = other1464.validWriteIdList;
-  processorCapabilities = other1464.processorCapabilities;
-  processorIdentifier = other1464.processorIdentifier;
-  __isset = other1464.__isset;
+AlterTableRequest& AlterTableRequest::operator=(const AlterTableRequest& other1472) {
+  catName = other1472.catName;
+  dbName = other1472.dbName;
+  tableName = other1472.tableName;
+  table = other1472.table;
+  environmentContext = other1472.environmentContext;
+  writeId = other1472.writeId;
+  validWriteIdList = other1472.validWriteIdList;
+  processorCapabilities = other1472.processorCapabilities;
+  processorIdentifier = other1472.processorIdentifier;
+  __isset = other1472.__isset;
   return *this;
 }
 void AlterTableRequest::printTo(std::ostream& out) const {
@@ -41401,11 +41553,11 @@
   (void) b;
 }
 
-AlterTableResponse::AlterTableResponse(const AlterTableResponse& other1465) {
-  (void) other1465;
+AlterTableResponse::AlterTableResponse(const AlterTableResponse& other1473) {
+  (void) other1473;
 }
-AlterTableResponse& AlterTableResponse::operator=(const AlterTableResponse& other1466) {
-  (void) other1466;
+AlterTableResponse& AlterTableResponse::operator=(const AlterTableResponse& other1474) {
+  (void) other1474;
   return *this;
 }
 void AlterTableResponse::printTo(std::ostream& out) const {
@@ -41415,158 +41567,6 @@
 }
 
 
-GetProjectionsSpec::~GetProjectionsSpec() noexcept {
-}
-
-
-void GetProjectionsSpec::__set_fieldList(const std::vector<std::string> & val) {
-  this->fieldList = val;
-}
-
-void GetProjectionsSpec::__set_includeParamKeyPattern(const std::string& val) {
-  this->includeParamKeyPattern = val;
-}
-
-void GetProjectionsSpec::__set_excludeParamKeyPattern(const std::string& val) {
-  this->excludeParamKeyPattern = val;
-}
-std::ostream& operator<<(std::ostream& out, const GetProjectionsSpec& obj)
-{
-  obj.printTo(out);
-  return out;
-}
-
-
-uint32_t GetProjectionsSpec::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*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_LIST) {
-          {
-            this->fieldList.clear();
-            uint32_t _size1467;
-            ::apache::thrift::protocol::TType _etype1470;
-            xfer += iprot->readListBegin(_etype1470, _size1467);
-            this->fieldList.resize(_size1467);
-            uint32_t _i1471;
-            for (_i1471 = 0; _i1471 < _size1467; ++_i1471)
-            {
-              xfer += iprot->readString(this->fieldList[_i1471]);
-            }
-            xfer += iprot->readListEnd();
-          }
-          this->__isset.fieldList = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->includeParamKeyPattern);
-          this->__isset.includeParamKeyPattern = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->excludeParamKeyPattern);
-          this->__isset.excludeParamKeyPattern = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t GetProjectionsSpec::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("GetProjectionsSpec");
-
-  xfer += oprot->writeFieldBegin("fieldList", ::apache::thrift::protocol::T_LIST, 1);
-  {
-    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->fieldList.size()));
-    std::vector<std::string> ::const_iterator _iter1472;
-    for (_iter1472 = this->fieldList.begin(); _iter1472 != this->fieldList.end(); ++_iter1472)
-    {
-      xfer += oprot->writeString((*_iter1472));
-    }
-    xfer += oprot->writeListEnd();
-  }
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("includeParamKeyPattern", ::apache::thrift::protocol::T_STRING, 2);
-  xfer += oprot->writeString(this->includeParamKeyPattern);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("excludeParamKeyPattern", ::apache::thrift::protocol::T_STRING, 3);
-  xfer += oprot->writeString(this->excludeParamKeyPattern);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
-void swap(GetProjectionsSpec &a, GetProjectionsSpec &b) {
-  using ::std::swap;
-  swap(a.fieldList, b.fieldList);
-  swap(a.includeParamKeyPattern, b.includeParamKeyPattern);
-  swap(a.excludeParamKeyPattern, b.excludeParamKeyPattern);
-  swap(a.__isset, b.__isset);
-}
-
-GetProjectionsSpec::GetProjectionsSpec(const GetProjectionsSpec& other1473) {
-  fieldList = other1473.fieldList;
-  includeParamKeyPattern = other1473.includeParamKeyPattern;
-  excludeParamKeyPattern = other1473.excludeParamKeyPattern;
-  __isset = other1473.__isset;
-}
-GetProjectionsSpec& GetProjectionsSpec::operator=(const GetProjectionsSpec& other1474) {
-  fieldList = other1474.fieldList;
-  includeParamKeyPattern = other1474.includeParamKeyPattern;
-  excludeParamKeyPattern = other1474.excludeParamKeyPattern;
-  __isset = other1474.__isset;
-  return *this;
-}
-void GetProjectionsSpec::printTo(std::ostream& out) const {
-  using ::apache::thrift::to_string;
-  out << "GetProjectionsSpec(";
-  out << "fieldList=" << to_string(fieldList);
-  out << ", " << "includeParamKeyPattern=" << to_string(includeParamKeyPattern);
-  out << ", " << "excludeParamKeyPattern=" << to_string(excludeParamKeyPattern);
-  out << ")";
-}
-
-
 GetPartitionsFilterSpec::~GetPartitionsFilterSpec() noexcept {
 }
 
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_types.h b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_types.h
index 397cc85..6223681 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_types.h
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_types.h
@@ -752,6 +752,8 @@
 
 class ClientCapabilities;
 
+class GetProjectionsSpec;
+
 class GetTableRequest;
 
 class GetTableResult;
@@ -908,8 +910,6 @@
 
 class AlterTableResponse;
 
-class GetProjectionsSpec;
-
 class GetPartitionsFilterSpec;
 
 class GetPartitionsResponse;
@@ -11255,6 +11255,60 @@
 
 std::ostream& operator<<(std::ostream& out, const ClientCapabilities& obj);
 
+typedef struct _GetProjectionsSpec__isset {
+  _GetProjectionsSpec__isset() : fieldList(false), includeParamKeyPattern(false), excludeParamKeyPattern(false) {}
+  bool fieldList :1;
+  bool includeParamKeyPattern :1;
+  bool excludeParamKeyPattern :1;
+} _GetProjectionsSpec__isset;
+
+class GetProjectionsSpec : public virtual ::apache::thrift::TBase {
+ public:
+
+  GetProjectionsSpec(const GetProjectionsSpec&);
+  GetProjectionsSpec& operator=(const GetProjectionsSpec&);
+  GetProjectionsSpec() : includeParamKeyPattern(), excludeParamKeyPattern() {
+  }
+
+  virtual ~GetProjectionsSpec() noexcept;
+  std::vector<std::string>  fieldList;
+  std::string includeParamKeyPattern;
+  std::string excludeParamKeyPattern;
+
+  _GetProjectionsSpec__isset __isset;
+
+  void __set_fieldList(const std::vector<std::string> & val);
+
+  void __set_includeParamKeyPattern(const std::string& val);
+
+  void __set_excludeParamKeyPattern(const std::string& val);
+
+  bool operator == (const GetProjectionsSpec & rhs) const
+  {
+    if (!(fieldList == rhs.fieldList))
+      return false;
+    if (!(includeParamKeyPattern == rhs.includeParamKeyPattern))
+      return false;
+    if (!(excludeParamKeyPattern == rhs.excludeParamKeyPattern))
+      return false;
+    return true;
+  }
+  bool operator != (const GetProjectionsSpec &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const GetProjectionsSpec & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+  virtual void printTo(std::ostream& out) const;
+};
+
+void swap(GetProjectionsSpec &a, GetProjectionsSpec &b);
+
+std::ostream& operator<<(std::ostream& out, const GetProjectionsSpec& obj);
+
 typedef struct _GetTableRequest__isset {
   _GetTableRequest__isset() : capabilities(false), catName(false), validWriteIdList(false), getColumnStats(false), processorCapabilities(false), processorIdentifier(false), engine(false), id(true) {}
   bool capabilities :1;
@@ -15527,60 +15581,6 @@
 
 std::ostream& operator<<(std::ostream& out, const AlterTableResponse& obj);
 
-typedef struct _GetProjectionsSpec__isset {
-  _GetProjectionsSpec__isset() : fieldList(false), includeParamKeyPattern(false), excludeParamKeyPattern(false) {}
-  bool fieldList :1;
-  bool includeParamKeyPattern :1;
-  bool excludeParamKeyPattern :1;
-} _GetProjectionsSpec__isset;
-
-class GetProjectionsSpec : public virtual ::apache::thrift::TBase {
- public:
-
-  GetProjectionsSpec(const GetProjectionsSpec&);
-  GetProjectionsSpec& operator=(const GetProjectionsSpec&);
-  GetProjectionsSpec() : includeParamKeyPattern(), excludeParamKeyPattern() {
-  }
-
-  virtual ~GetProjectionsSpec() noexcept;
-  std::vector<std::string>  fieldList;
-  std::string includeParamKeyPattern;
-  std::string excludeParamKeyPattern;
-
-  _GetProjectionsSpec__isset __isset;
-
-  void __set_fieldList(const std::vector<std::string> & val);
-
-  void __set_includeParamKeyPattern(const std::string& val);
-
-  void __set_excludeParamKeyPattern(const std::string& val);
-
-  bool operator == (const GetProjectionsSpec & rhs) const
-  {
-    if (!(fieldList == rhs.fieldList))
-      return false;
-    if (!(includeParamKeyPattern == rhs.includeParamKeyPattern))
-      return false;
-    if (!(excludeParamKeyPattern == rhs.excludeParamKeyPattern))
-      return false;
-    return true;
-  }
-  bool operator != (const GetProjectionsSpec &rhs) const {
-    return !(*this == rhs);
-  }
-
-  bool operator < (const GetProjectionsSpec & ) const;
-
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-  virtual void printTo(std::ostream& out) const;
-};
-
-void swap(GetProjectionsSpec &a, GetProjectionsSpec &b);
-
-std::ostream& operator<<(std::ostream& out, const GetProjectionsSpec& obj);
-
 typedef struct _GetPartitionsFilterSpec__isset {
   _GetPartitionsFilterSpec__isset() : filterMode(false), filters(false) {}
   bool filterMode :1;
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterPartitionsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterPartitionsRequest.java
index 87fe3e2..b714db2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterPartitionsRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterPartitionsRequest.java
@@ -853,14 +853,14 @@
           case 4: // PARTITIONS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list1192 = iprot.readListBegin();
-                struct.partitions = new java.util.ArrayList<Partition>(_list1192.size);
-                @org.apache.thrift.annotation.Nullable Partition _elem1193;
-                for (int _i1194 = 0; _i1194 < _list1192.size; ++_i1194)
+                org.apache.thrift.protocol.TList _list1200 = iprot.readListBegin();
+                struct.partitions = new java.util.ArrayList<Partition>(_list1200.size);
+                @org.apache.thrift.annotation.Nullable Partition _elem1201;
+                for (int _i1202 = 0; _i1202 < _list1200.size; ++_i1202)
                 {
-                  _elem1193 = new Partition();
-                  _elem1193.read(iprot);
-                  struct.partitions.add(_elem1193);
+                  _elem1201 = new Partition();
+                  _elem1201.read(iprot);
+                  struct.partitions.add(_elem1201);
                 }
                 iprot.readListEnd();
               }
@@ -928,9 +928,9 @@
         oprot.writeFieldBegin(PARTITIONS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.partitions.size()));
-          for (Partition _iter1195 : struct.partitions)
+          for (Partition _iter1203 : struct.partitions)
           {
-            _iter1195.write(oprot);
+            _iter1203.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -976,9 +976,9 @@
       oprot.writeString(struct.tableName);
       {
         oprot.writeI32(struct.partitions.size());
-        for (Partition _iter1196 : struct.partitions)
+        for (Partition _iter1204 : struct.partitions)
         {
-          _iter1196.write(oprot);
+          _iter1204.write(oprot);
         }
       }
       java.util.BitSet optionals = new java.util.BitSet();
@@ -1017,14 +1017,14 @@
       struct.tableName = iprot.readString();
       struct.setTableNameIsSet(true);
       {
-        org.apache.thrift.protocol.TList _list1197 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-        struct.partitions = new java.util.ArrayList<Partition>(_list1197.size);
-        @org.apache.thrift.annotation.Nullable Partition _elem1198;
-        for (int _i1199 = 0; _i1199 < _list1197.size; ++_i1199)
+        org.apache.thrift.protocol.TList _list1205 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+        struct.partitions = new java.util.ArrayList<Partition>(_list1205.size);
+        @org.apache.thrift.annotation.Nullable Partition _elem1206;
+        for (int _i1207 = 0; _i1207 < _list1205.size; ++_i1207)
         {
-          _elem1198 = new Partition();
-          _elem1198.read(iprot);
-          struct.partitions.add(_elem1198);
+          _elem1206 = new Partition();
+          _elem1206.read(iprot);
+          struct.partitions.add(_elem1206);
         }
       }
       struct.setPartitionsIsSet(true);
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterTableRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterTableRequest.java
index b28313e..8c22462 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterTableRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterTableRequest.java
@@ -1049,13 +1049,13 @@
           case 8: // PROCESSOR_CAPABILITIES
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list1208 = iprot.readListBegin();
-                struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1208.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1209;
-                for (int _i1210 = 0; _i1210 < _list1208.size; ++_i1210)
+                org.apache.thrift.protocol.TList _list1216 = iprot.readListBegin();
+                struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1216.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem1217;
+                for (int _i1218 = 0; _i1218 < _list1216.size; ++_i1218)
                 {
-                  _elem1209 = iprot.readString();
-                  struct.processorCapabilities.add(_elem1209);
+                  _elem1217 = iprot.readString();
+                  struct.processorCapabilities.add(_elem1217);
                 }
                 iprot.readListEnd();
               }
@@ -1131,9 +1131,9 @@
           oprot.writeFieldBegin(PROCESSOR_CAPABILITIES_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.processorCapabilities.size()));
-            for (java.lang.String _iter1211 : struct.processorCapabilities)
+            for (java.lang.String _iter1219 : struct.processorCapabilities)
             {
-              oprot.writeString(_iter1211);
+              oprot.writeString(_iter1219);
             }
             oprot.writeListEnd();
           }
@@ -1202,9 +1202,9 @@
       if (struct.isSetProcessorCapabilities()) {
         {
           oprot.writeI32(struct.processorCapabilities.size());
-          for (java.lang.String _iter1212 : struct.processorCapabilities)
+          for (java.lang.String _iter1220 : struct.processorCapabilities)
           {
-            oprot.writeString(_iter1212);
+            oprot.writeString(_iter1220);
           }
         }
       }
@@ -1243,13 +1243,13 @@
       }
       if (incoming.get(4)) {
         {
-          org.apache.thrift.protocol.TList _list1213 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1213.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1214;
-          for (int _i1215 = 0; _i1215 < _list1213.size; ++_i1215)
+          org.apache.thrift.protocol.TList _list1221 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1221.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem1222;
+          for (int _i1223 = 0; _i1223 < _list1221.size; ++_i1223)
           {
-            _elem1214 = iprot.readString();
-            struct.processorCapabilities.add(_elem1214);
+            _elem1222 = iprot.readString();
+            struct.processorCapabilities.add(_elem1222);
           }
         }
         struct.setProcessorCapabilitiesIsSet(true);
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreateTableRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreateTableRequest.java
index 32e15b1..f7a9c96 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreateTableRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreateTableRequest.java
@@ -1208,14 +1208,14 @@
           case 3: // PRIMARY_KEYS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list1136 = iprot.readListBegin();
-                struct.primaryKeys = new java.util.ArrayList<SQLPrimaryKey>(_list1136.size);
-                @org.apache.thrift.annotation.Nullable SQLPrimaryKey _elem1137;
-                for (int _i1138 = 0; _i1138 < _list1136.size; ++_i1138)
+                org.apache.thrift.protocol.TList _list1144 = iprot.readListBegin();
+                struct.primaryKeys = new java.util.ArrayList<SQLPrimaryKey>(_list1144.size);
+                @org.apache.thrift.annotation.Nullable SQLPrimaryKey _elem1145;
+                for (int _i1146 = 0; _i1146 < _list1144.size; ++_i1146)
                 {
-                  _elem1137 = new SQLPrimaryKey();
-                  _elem1137.read(iprot);
-                  struct.primaryKeys.add(_elem1137);
+                  _elem1145 = new SQLPrimaryKey();
+                  _elem1145.read(iprot);
+                  struct.primaryKeys.add(_elem1145);
                 }
                 iprot.readListEnd();
               }
@@ -1227,14 +1227,14 @@
           case 4: // FOREIGN_KEYS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list1139 = iprot.readListBegin();
-                struct.foreignKeys = new java.util.ArrayList<SQLForeignKey>(_list1139.size);
-                @org.apache.thrift.annotation.Nullable SQLForeignKey _elem1140;
-                for (int _i1141 = 0; _i1141 < _list1139.size; ++_i1141)
+                org.apache.thrift.protocol.TList _list1147 = iprot.readListBegin();
+                struct.foreignKeys = new java.util.ArrayList<SQLForeignKey>(_list1147.size);
+                @org.apache.thrift.annotation.Nullable SQLForeignKey _elem1148;
+                for (int _i1149 = 0; _i1149 < _list1147.size; ++_i1149)
                 {
-                  _elem1140 = new SQLForeignKey();
-                  _elem1140.read(iprot);
-                  struct.foreignKeys.add(_elem1140);
+                  _elem1148 = new SQLForeignKey();
+                  _elem1148.read(iprot);
+                  struct.foreignKeys.add(_elem1148);
                 }
                 iprot.readListEnd();
               }
@@ -1246,14 +1246,14 @@
           case 5: // UNIQUE_CONSTRAINTS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list1142 = iprot.readListBegin();
-                struct.uniqueConstraints = new java.util.ArrayList<SQLUniqueConstraint>(_list1142.size);
-                @org.apache.thrift.annotation.Nullable SQLUniqueConstraint _elem1143;
-                for (int _i1144 = 0; _i1144 < _list1142.size; ++_i1144)
+                org.apache.thrift.protocol.TList _list1150 = iprot.readListBegin();
+                struct.uniqueConstraints = new java.util.ArrayList<SQLUniqueConstraint>(_list1150.size);
+                @org.apache.thrift.annotation.Nullable SQLUniqueConstraint _elem1151;
+                for (int _i1152 = 0; _i1152 < _list1150.size; ++_i1152)
                 {
-                  _elem1143 = new SQLUniqueConstraint();
-                  _elem1143.read(iprot);
-                  struct.uniqueConstraints.add(_elem1143);
+                  _elem1151 = new SQLUniqueConstraint();
+                  _elem1151.read(iprot);
+                  struct.uniqueConstraints.add(_elem1151);
                 }
                 iprot.readListEnd();
               }
@@ -1265,14 +1265,14 @@
           case 6: // NOT_NULL_CONSTRAINTS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list1145 = iprot.readListBegin();
-                struct.notNullConstraints = new java.util.ArrayList<SQLNotNullConstraint>(_list1145.size);
-                @org.apache.thrift.annotation.Nullable SQLNotNullConstraint _elem1146;
-                for (int _i1147 = 0; _i1147 < _list1145.size; ++_i1147)
+                org.apache.thrift.protocol.TList _list1153 = iprot.readListBegin();
+                struct.notNullConstraints = new java.util.ArrayList<SQLNotNullConstraint>(_list1153.size);
+                @org.apache.thrift.annotation.Nullable SQLNotNullConstraint _elem1154;
+                for (int _i1155 = 0; _i1155 < _list1153.size; ++_i1155)
                 {
-                  _elem1146 = new SQLNotNullConstraint();
-                  _elem1146.read(iprot);
-                  struct.notNullConstraints.add(_elem1146);
+                  _elem1154 = new SQLNotNullConstraint();
+                  _elem1154.read(iprot);
+                  struct.notNullConstraints.add(_elem1154);
                 }
                 iprot.readListEnd();
               }
@@ -1284,14 +1284,14 @@
           case 7: // DEFAULT_CONSTRAINTS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list1148 = iprot.readListBegin();
-                struct.defaultConstraints = new java.util.ArrayList<SQLDefaultConstraint>(_list1148.size);
-                @org.apache.thrift.annotation.Nullable SQLDefaultConstraint _elem1149;
-                for (int _i1150 = 0; _i1150 < _list1148.size; ++_i1150)
+                org.apache.thrift.protocol.TList _list1156 = iprot.readListBegin();
+                struct.defaultConstraints = new java.util.ArrayList<SQLDefaultConstraint>(_list1156.size);
+                @org.apache.thrift.annotation.Nullable SQLDefaultConstraint _elem1157;
+                for (int _i1158 = 0; _i1158 < _list1156.size; ++_i1158)
                 {
-                  _elem1149 = new SQLDefaultConstraint();
-                  _elem1149.read(iprot);
-                  struct.defaultConstraints.add(_elem1149);
+                  _elem1157 = new SQLDefaultConstraint();
+                  _elem1157.read(iprot);
+                  struct.defaultConstraints.add(_elem1157);
                 }
                 iprot.readListEnd();
               }
@@ -1303,14 +1303,14 @@
           case 8: // CHECK_CONSTRAINTS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list1151 = iprot.readListBegin();
-                struct.checkConstraints = new java.util.ArrayList<SQLCheckConstraint>(_list1151.size);
-                @org.apache.thrift.annotation.Nullable SQLCheckConstraint _elem1152;
-                for (int _i1153 = 0; _i1153 < _list1151.size; ++_i1153)
+                org.apache.thrift.protocol.TList _list1159 = iprot.readListBegin();
+                struct.checkConstraints = new java.util.ArrayList<SQLCheckConstraint>(_list1159.size);
+                @org.apache.thrift.annotation.Nullable SQLCheckConstraint _elem1160;
+                for (int _i1161 = 0; _i1161 < _list1159.size; ++_i1161)
                 {
-                  _elem1152 = new SQLCheckConstraint();
-                  _elem1152.read(iprot);
-                  struct.checkConstraints.add(_elem1152);
+                  _elem1160 = new SQLCheckConstraint();
+                  _elem1160.read(iprot);
+                  struct.checkConstraints.add(_elem1160);
                 }
                 iprot.readListEnd();
               }
@@ -1322,13 +1322,13 @@
           case 9: // PROCESSOR_CAPABILITIES
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list1154 = iprot.readListBegin();
-                struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1154.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1155;
-                for (int _i1156 = 0; _i1156 < _list1154.size; ++_i1156)
+                org.apache.thrift.protocol.TList _list1162 = iprot.readListBegin();
+                struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1162.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem1163;
+                for (int _i1164 = 0; _i1164 < _list1162.size; ++_i1164)
                 {
-                  _elem1155 = iprot.readString();
-                  struct.processorCapabilities.add(_elem1155);
+                  _elem1163 = iprot.readString();
+                  struct.processorCapabilities.add(_elem1163);
                 }
                 iprot.readListEnd();
               }
@@ -1375,9 +1375,9 @@
           oprot.writeFieldBegin(PRIMARY_KEYS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.primaryKeys.size()));
-            for (SQLPrimaryKey _iter1157 : struct.primaryKeys)
+            for (SQLPrimaryKey _iter1165 : struct.primaryKeys)
             {
-              _iter1157.write(oprot);
+              _iter1165.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -1389,9 +1389,9 @@
           oprot.writeFieldBegin(FOREIGN_KEYS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.foreignKeys.size()));
-            for (SQLForeignKey _iter1158 : struct.foreignKeys)
+            for (SQLForeignKey _iter1166 : struct.foreignKeys)
             {
-              _iter1158.write(oprot);
+              _iter1166.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -1403,9 +1403,9 @@
           oprot.writeFieldBegin(UNIQUE_CONSTRAINTS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.uniqueConstraints.size()));
-            for (SQLUniqueConstraint _iter1159 : struct.uniqueConstraints)
+            for (SQLUniqueConstraint _iter1167 : struct.uniqueConstraints)
             {
-              _iter1159.write(oprot);
+              _iter1167.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -1417,9 +1417,9 @@
           oprot.writeFieldBegin(NOT_NULL_CONSTRAINTS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.notNullConstraints.size()));
-            for (SQLNotNullConstraint _iter1160 : struct.notNullConstraints)
+            for (SQLNotNullConstraint _iter1168 : struct.notNullConstraints)
             {
-              _iter1160.write(oprot);
+              _iter1168.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -1431,9 +1431,9 @@
           oprot.writeFieldBegin(DEFAULT_CONSTRAINTS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.defaultConstraints.size()));
-            for (SQLDefaultConstraint _iter1161 : struct.defaultConstraints)
+            for (SQLDefaultConstraint _iter1169 : struct.defaultConstraints)
             {
-              _iter1161.write(oprot);
+              _iter1169.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -1445,9 +1445,9 @@
           oprot.writeFieldBegin(CHECK_CONSTRAINTS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.checkConstraints.size()));
-            for (SQLCheckConstraint _iter1162 : struct.checkConstraints)
+            for (SQLCheckConstraint _iter1170 : struct.checkConstraints)
             {
-              _iter1162.write(oprot);
+              _iter1170.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -1459,9 +1459,9 @@
           oprot.writeFieldBegin(PROCESSOR_CAPABILITIES_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.processorCapabilities.size()));
-            for (java.lang.String _iter1163 : struct.processorCapabilities)
+            for (java.lang.String _iter1171 : struct.processorCapabilities)
             {
-              oprot.writeString(_iter1163);
+              oprot.writeString(_iter1171);
             }
             oprot.writeListEnd();
           }
@@ -1528,63 +1528,63 @@
       if (struct.isSetPrimaryKeys()) {
         {
           oprot.writeI32(struct.primaryKeys.size());
-          for (SQLPrimaryKey _iter1164 : struct.primaryKeys)
+          for (SQLPrimaryKey _iter1172 : struct.primaryKeys)
           {
-            _iter1164.write(oprot);
+            _iter1172.write(oprot);
           }
         }
       }
       if (struct.isSetForeignKeys()) {
         {
           oprot.writeI32(struct.foreignKeys.size());
-          for (SQLForeignKey _iter1165 : struct.foreignKeys)
+          for (SQLForeignKey _iter1173 : struct.foreignKeys)
           {
-            _iter1165.write(oprot);
+            _iter1173.write(oprot);
           }
         }
       }
       if (struct.isSetUniqueConstraints()) {
         {
           oprot.writeI32(struct.uniqueConstraints.size());
-          for (SQLUniqueConstraint _iter1166 : struct.uniqueConstraints)
+          for (SQLUniqueConstraint _iter1174 : struct.uniqueConstraints)
           {
-            _iter1166.write(oprot);
+            _iter1174.write(oprot);
           }
         }
       }
       if (struct.isSetNotNullConstraints()) {
         {
           oprot.writeI32(struct.notNullConstraints.size());
-          for (SQLNotNullConstraint _iter1167 : struct.notNullConstraints)
+          for (SQLNotNullConstraint _iter1175 : struct.notNullConstraints)
           {
-            _iter1167.write(oprot);
+            _iter1175.write(oprot);
           }
         }
       }
       if (struct.isSetDefaultConstraints()) {
         {
           oprot.writeI32(struct.defaultConstraints.size());
-          for (SQLDefaultConstraint _iter1168 : struct.defaultConstraints)
+          for (SQLDefaultConstraint _iter1176 : struct.defaultConstraints)
           {
-            _iter1168.write(oprot);
+            _iter1176.write(oprot);
           }
         }
       }
       if (struct.isSetCheckConstraints()) {
         {
           oprot.writeI32(struct.checkConstraints.size());
-          for (SQLCheckConstraint _iter1169 : struct.checkConstraints)
+          for (SQLCheckConstraint _iter1177 : struct.checkConstraints)
           {
-            _iter1169.write(oprot);
+            _iter1177.write(oprot);
           }
         }
       }
       if (struct.isSetProcessorCapabilities()) {
         {
           oprot.writeI32(struct.processorCapabilities.size());
-          for (java.lang.String _iter1170 : struct.processorCapabilities)
+          for (java.lang.String _iter1178 : struct.processorCapabilities)
           {
-            oprot.writeString(_iter1170);
+            oprot.writeString(_iter1178);
           }
         }
       }
@@ -1607,97 +1607,97 @@
       }
       if (incoming.get(1)) {
         {
-          org.apache.thrift.protocol.TList _list1171 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.primaryKeys = new java.util.ArrayList<SQLPrimaryKey>(_list1171.size);
-          @org.apache.thrift.annotation.Nullable SQLPrimaryKey _elem1172;
-          for (int _i1173 = 0; _i1173 < _list1171.size; ++_i1173)
+          org.apache.thrift.protocol.TList _list1179 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.primaryKeys = new java.util.ArrayList<SQLPrimaryKey>(_list1179.size);
+          @org.apache.thrift.annotation.Nullable SQLPrimaryKey _elem1180;
+          for (int _i1181 = 0; _i1181 < _list1179.size; ++_i1181)
           {
-            _elem1172 = new SQLPrimaryKey();
-            _elem1172.read(iprot);
-            struct.primaryKeys.add(_elem1172);
+            _elem1180 = new SQLPrimaryKey();
+            _elem1180.read(iprot);
+            struct.primaryKeys.add(_elem1180);
           }
         }
         struct.setPrimaryKeysIsSet(true);
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TList _list1174 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.foreignKeys = new java.util.ArrayList<SQLForeignKey>(_list1174.size);
-          @org.apache.thrift.annotation.Nullable SQLForeignKey _elem1175;
-          for (int _i1176 = 0; _i1176 < _list1174.size; ++_i1176)
+          org.apache.thrift.protocol.TList _list1182 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.foreignKeys = new java.util.ArrayList<SQLForeignKey>(_list1182.size);
+          @org.apache.thrift.annotation.Nullable SQLForeignKey _elem1183;
+          for (int _i1184 = 0; _i1184 < _list1182.size; ++_i1184)
           {
-            _elem1175 = new SQLForeignKey();
-            _elem1175.read(iprot);
-            struct.foreignKeys.add(_elem1175);
+            _elem1183 = new SQLForeignKey();
+            _elem1183.read(iprot);
+            struct.foreignKeys.add(_elem1183);
           }
         }
         struct.setForeignKeysIsSet(true);
       }
       if (incoming.get(3)) {
         {
-          org.apache.thrift.protocol.TList _list1177 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.uniqueConstraints = new java.util.ArrayList<SQLUniqueConstraint>(_list1177.size);
-          @org.apache.thrift.annotation.Nullable SQLUniqueConstraint _elem1178;
-          for (int _i1179 = 0; _i1179 < _list1177.size; ++_i1179)
+          org.apache.thrift.protocol.TList _list1185 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.uniqueConstraints = new java.util.ArrayList<SQLUniqueConstraint>(_list1185.size);
+          @org.apache.thrift.annotation.Nullable SQLUniqueConstraint _elem1186;
+          for (int _i1187 = 0; _i1187 < _list1185.size; ++_i1187)
           {
-            _elem1178 = new SQLUniqueConstraint();
-            _elem1178.read(iprot);
-            struct.uniqueConstraints.add(_elem1178);
+            _elem1186 = new SQLUniqueConstraint();
+            _elem1186.read(iprot);
+            struct.uniqueConstraints.add(_elem1186);
           }
         }
         struct.setUniqueConstraintsIsSet(true);
       }
       if (incoming.get(4)) {
         {
-          org.apache.thrift.protocol.TList _list1180 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.notNullConstraints = new java.util.ArrayList<SQLNotNullConstraint>(_list1180.size);
-          @org.apache.thrift.annotation.Nullable SQLNotNullConstraint _elem1181;
-          for (int _i1182 = 0; _i1182 < _list1180.size; ++_i1182)
+          org.apache.thrift.protocol.TList _list1188 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.notNullConstraints = new java.util.ArrayList<SQLNotNullConstraint>(_list1188.size);
+          @org.apache.thrift.annotation.Nullable SQLNotNullConstraint _elem1189;
+          for (int _i1190 = 0; _i1190 < _list1188.size; ++_i1190)
           {
-            _elem1181 = new SQLNotNullConstraint();
-            _elem1181.read(iprot);
-            struct.notNullConstraints.add(_elem1181);
+            _elem1189 = new SQLNotNullConstraint();
+            _elem1189.read(iprot);
+            struct.notNullConstraints.add(_elem1189);
           }
         }
         struct.setNotNullConstraintsIsSet(true);
       }
       if (incoming.get(5)) {
         {
-          org.apache.thrift.protocol.TList _list1183 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.defaultConstraints = new java.util.ArrayList<SQLDefaultConstraint>(_list1183.size);
-          @org.apache.thrift.annotation.Nullable SQLDefaultConstraint _elem1184;
-          for (int _i1185 = 0; _i1185 < _list1183.size; ++_i1185)
+          org.apache.thrift.protocol.TList _list1191 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.defaultConstraints = new java.util.ArrayList<SQLDefaultConstraint>(_list1191.size);
+          @org.apache.thrift.annotation.Nullable SQLDefaultConstraint _elem1192;
+          for (int _i1193 = 0; _i1193 < _list1191.size; ++_i1193)
           {
-            _elem1184 = new SQLDefaultConstraint();
-            _elem1184.read(iprot);
-            struct.defaultConstraints.add(_elem1184);
+            _elem1192 = new SQLDefaultConstraint();
+            _elem1192.read(iprot);
+            struct.defaultConstraints.add(_elem1192);
           }
         }
         struct.setDefaultConstraintsIsSet(true);
       }
       if (incoming.get(6)) {
         {
-          org.apache.thrift.protocol.TList _list1186 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.checkConstraints = new java.util.ArrayList<SQLCheckConstraint>(_list1186.size);
-          @org.apache.thrift.annotation.Nullable SQLCheckConstraint _elem1187;
-          for (int _i1188 = 0; _i1188 < _list1186.size; ++_i1188)
+          org.apache.thrift.protocol.TList _list1194 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.checkConstraints = new java.util.ArrayList<SQLCheckConstraint>(_list1194.size);
+          @org.apache.thrift.annotation.Nullable SQLCheckConstraint _elem1195;
+          for (int _i1196 = 0; _i1196 < _list1194.size; ++_i1196)
           {
-            _elem1187 = new SQLCheckConstraint();
-            _elem1187.read(iprot);
-            struct.checkConstraints.add(_elem1187);
+            _elem1195 = new SQLCheckConstraint();
+            _elem1195.read(iprot);
+            struct.checkConstraints.add(_elem1195);
           }
         }
         struct.setCheckConstraintsIsSet(true);
       }
       if (incoming.get(7)) {
         {
-          org.apache.thrift.protocol.TList _list1189 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1189.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1190;
-          for (int _i1191 = 0; _i1191 < _list1189.size; ++_i1191)
+          org.apache.thrift.protocol.TList _list1197 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1197.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem1198;
+          for (int _i1199 = 0; _i1199 < _list1197.size; ++_i1199)
           {
-            _elem1190 = iprot.readString();
-            struct.processorCapabilities.add(_elem1190);
+            _elem1198 = iprot.readString();
+            struct.processorCapabilities.add(_elem1198);
           }
         }
         struct.setProcessorCapabilitiesIsSet(true);
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ExtendedTableInfo.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ExtendedTableInfo.java
index c07ba10..04edb6d 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ExtendedTableInfo.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ExtendedTableInfo.java
@@ -604,13 +604,13 @@
           case 3: // REQUIRED_READ_CAPABILITIES
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list1032 = iprot.readListBegin();
-                struct.requiredReadCapabilities = new java.util.ArrayList<java.lang.String>(_list1032.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1033;
-                for (int _i1034 = 0; _i1034 < _list1032.size; ++_i1034)
+                org.apache.thrift.protocol.TList _list1040 = iprot.readListBegin();
+                struct.requiredReadCapabilities = new java.util.ArrayList<java.lang.String>(_list1040.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem1041;
+                for (int _i1042 = 0; _i1042 < _list1040.size; ++_i1042)
                 {
-                  _elem1033 = iprot.readString();
-                  struct.requiredReadCapabilities.add(_elem1033);
+                  _elem1041 = iprot.readString();
+                  struct.requiredReadCapabilities.add(_elem1041);
                 }
                 iprot.readListEnd();
               }
@@ -622,13 +622,13 @@
           case 4: // REQUIRED_WRITE_CAPABILITIES
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list1035 = iprot.readListBegin();
-                struct.requiredWriteCapabilities = new java.util.ArrayList<java.lang.String>(_list1035.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1036;
-                for (int _i1037 = 0; _i1037 < _list1035.size; ++_i1037)
+                org.apache.thrift.protocol.TList _list1043 = iprot.readListBegin();
+                struct.requiredWriteCapabilities = new java.util.ArrayList<java.lang.String>(_list1043.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem1044;
+                for (int _i1045 = 0; _i1045 < _list1043.size; ++_i1045)
                 {
-                  _elem1036 = iprot.readString();
-                  struct.requiredWriteCapabilities.add(_elem1036);
+                  _elem1044 = iprot.readString();
+                  struct.requiredWriteCapabilities.add(_elem1044);
                 }
                 iprot.readListEnd();
               }
@@ -665,9 +665,9 @@
           oprot.writeFieldBegin(REQUIRED_READ_CAPABILITIES_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.requiredReadCapabilities.size()));
-            for (java.lang.String _iter1038 : struct.requiredReadCapabilities)
+            for (java.lang.String _iter1046 : struct.requiredReadCapabilities)
             {
-              oprot.writeString(_iter1038);
+              oprot.writeString(_iter1046);
             }
             oprot.writeListEnd();
           }
@@ -679,9 +679,9 @@
           oprot.writeFieldBegin(REQUIRED_WRITE_CAPABILITIES_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.requiredWriteCapabilities.size()));
-            for (java.lang.String _iter1039 : struct.requiredWriteCapabilities)
+            for (java.lang.String _iter1047 : struct.requiredWriteCapabilities)
             {
-              oprot.writeString(_iter1039);
+              oprot.writeString(_iter1047);
             }
             oprot.writeListEnd();
           }
@@ -723,18 +723,18 @@
       if (struct.isSetRequiredReadCapabilities()) {
         {
           oprot.writeI32(struct.requiredReadCapabilities.size());
-          for (java.lang.String _iter1040 : struct.requiredReadCapabilities)
+          for (java.lang.String _iter1048 : struct.requiredReadCapabilities)
           {
-            oprot.writeString(_iter1040);
+            oprot.writeString(_iter1048);
           }
         }
       }
       if (struct.isSetRequiredWriteCapabilities()) {
         {
           oprot.writeI32(struct.requiredWriteCapabilities.size());
-          for (java.lang.String _iter1041 : struct.requiredWriteCapabilities)
+          for (java.lang.String _iter1049 : struct.requiredWriteCapabilities)
           {
-            oprot.writeString(_iter1041);
+            oprot.writeString(_iter1049);
           }
         }
       }
@@ -752,26 +752,26 @@
       }
       if (incoming.get(1)) {
         {
-          org.apache.thrift.protocol.TList _list1042 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.requiredReadCapabilities = new java.util.ArrayList<java.lang.String>(_list1042.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1043;
-          for (int _i1044 = 0; _i1044 < _list1042.size; ++_i1044)
+          org.apache.thrift.protocol.TList _list1050 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.requiredReadCapabilities = new java.util.ArrayList<java.lang.String>(_list1050.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem1051;
+          for (int _i1052 = 0; _i1052 < _list1050.size; ++_i1052)
           {
-            _elem1043 = iprot.readString();
-            struct.requiredReadCapabilities.add(_elem1043);
+            _elem1051 = iprot.readString();
+            struct.requiredReadCapabilities.add(_elem1051);
           }
         }
         struct.setRequiredReadCapabilitiesIsSet(true);
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TList _list1045 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.requiredWriteCapabilities = new java.util.ArrayList<java.lang.String>(_list1045.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1046;
-          for (int _i1047 = 0; _i1047 < _list1045.size; ++_i1047)
+          org.apache.thrift.protocol.TList _list1053 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.requiredWriteCapabilities = new java.util.ArrayList<java.lang.String>(_list1053.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem1054;
+          for (int _i1055 = 0; _i1055 < _list1053.size; ++_i1055)
           {
-            _elem1046 = iprot.readString();
-            struct.requiredWriteCapabilities.add(_elem1046);
+            _elem1054 = iprot.readString();
+            struct.requiredWriteCapabilities.add(_elem1054);
           }
         }
         struct.setRequiredWriteCapabilitiesIsSet(true);
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsResp.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsResp.java
index 06564a7..0288d9a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsResp.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsResp.java
@@ -327,14 +327,14 @@
           case 1: // SCHEMA_VERSIONS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list1128 = iprot.readListBegin();
-                struct.schemaVersions = new java.util.ArrayList<SchemaVersionDescriptor>(_list1128.size);
-                @org.apache.thrift.annotation.Nullable SchemaVersionDescriptor _elem1129;
-                for (int _i1130 = 0; _i1130 < _list1128.size; ++_i1130)
+                org.apache.thrift.protocol.TList _list1136 = iprot.readListBegin();
+                struct.schemaVersions = new java.util.ArrayList<SchemaVersionDescriptor>(_list1136.size);
+                @org.apache.thrift.annotation.Nullable SchemaVersionDescriptor _elem1137;
+                for (int _i1138 = 0; _i1138 < _list1136.size; ++_i1138)
                 {
-                  _elem1129 = new SchemaVersionDescriptor();
-                  _elem1129.read(iprot);
-                  struct.schemaVersions.add(_elem1129);
+                  _elem1137 = new SchemaVersionDescriptor();
+                  _elem1137.read(iprot);
+                  struct.schemaVersions.add(_elem1137);
                 }
                 iprot.readListEnd();
               }
@@ -360,9 +360,9 @@
         oprot.writeFieldBegin(SCHEMA_VERSIONS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.schemaVersions.size()));
-          for (SchemaVersionDescriptor _iter1131 : struct.schemaVersions)
+          for (SchemaVersionDescriptor _iter1139 : struct.schemaVersions)
           {
-            _iter1131.write(oprot);
+            _iter1139.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -393,9 +393,9 @@
       if (struct.isSetSchemaVersions()) {
         {
           oprot.writeI32(struct.schemaVersions.size());
-          for (SchemaVersionDescriptor _iter1132 : struct.schemaVersions)
+          for (SchemaVersionDescriptor _iter1140 : struct.schemaVersions)
           {
-            _iter1132.write(oprot);
+            _iter1140.write(oprot);
           }
         }
       }
@@ -407,14 +407,14 @@
       java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TList _list1133 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.schemaVersions = new java.util.ArrayList<SchemaVersionDescriptor>(_list1133.size);
-          @org.apache.thrift.annotation.Nullable SchemaVersionDescriptor _elem1134;
-          for (int _i1135 = 0; _i1135 < _list1133.size; ++_i1135)
+          org.apache.thrift.protocol.TList _list1141 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.schemaVersions = new java.util.ArrayList<SchemaVersionDescriptor>(_list1141.size);
+          @org.apache.thrift.annotation.Nullable SchemaVersionDescriptor _elem1142;
+          for (int _i1143 = 0; _i1143 < _list1141.size; ++_i1143)
           {
-            _elem1134 = new SchemaVersionDescriptor();
-            _elem1134.read(iprot);
-            struct.schemaVersions.add(_elem1134);
+            _elem1142 = new SchemaVersionDescriptor();
+            _elem1142.read(iprot);
+            struct.schemaVersions.add(_elem1142);
           }
         }
         struct.setSchemaVersionsIsSet(true);
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetDatabaseRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetDatabaseRequest.java
index 9ed3355..5724133 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetDatabaseRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetDatabaseRequest.java
@@ -579,13 +579,13 @@
           case 3: // PROCESSOR_CAPABILITIES
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list1048 = iprot.readListBegin();
-                struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1048.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1049;
-                for (int _i1050 = 0; _i1050 < _list1048.size; ++_i1050)
+                org.apache.thrift.protocol.TList _list1056 = iprot.readListBegin();
+                struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1056.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem1057;
+                for (int _i1058 = 0; _i1058 < _list1056.size; ++_i1058)
                 {
-                  _elem1049 = iprot.readString();
-                  struct.processorCapabilities.add(_elem1049);
+                  _elem1057 = iprot.readString();
+                  struct.processorCapabilities.add(_elem1057);
                 }
                 iprot.readListEnd();
               }
@@ -634,9 +634,9 @@
           oprot.writeFieldBegin(PROCESSOR_CAPABILITIES_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.processorCapabilities.size()));
-            for (java.lang.String _iter1051 : struct.processorCapabilities)
+            for (java.lang.String _iter1059 : struct.processorCapabilities)
             {
-              oprot.writeString(_iter1051);
+              oprot.writeString(_iter1059);
             }
             oprot.writeListEnd();
           }
@@ -690,9 +690,9 @@
       if (struct.isSetProcessorCapabilities()) {
         {
           oprot.writeI32(struct.processorCapabilities.size());
-          for (java.lang.String _iter1052 : struct.processorCapabilities)
+          for (java.lang.String _iter1060 : struct.processorCapabilities)
           {
-            oprot.writeString(_iter1052);
+            oprot.writeString(_iter1060);
           }
         }
       }
@@ -715,13 +715,13 @@
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TList _list1053 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1053.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1054;
-          for (int _i1055 = 0; _i1055 < _list1053.size; ++_i1055)
+          org.apache.thrift.protocol.TList _list1061 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1061.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem1062;
+          for (int _i1063 = 0; _i1063 < _list1061.size; ++_i1063)
           {
-            _elem1054 = iprot.readString();
-            struct.processorCapabilities.add(_elem1054);
+            _elem1062 = iprot.readString();
+            struct.processorCapabilities.add(_elem1062);
           }
         }
         struct.setProcessorCapabilitiesIsSet(true);
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetProjectionsSpec.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetProjectionsSpec.java
index d727296..8475ba5 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetProjectionsSpec.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetProjectionsSpec.java
@@ -486,13 +486,13 @@
           case 1: // FIELD_LIST
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list1216 = iprot.readListBegin();
-                struct.fieldList = new java.util.ArrayList<java.lang.String>(_list1216.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1217;
-                for (int _i1218 = 0; _i1218 < _list1216.size; ++_i1218)
+                org.apache.thrift.protocol.TList _list992 = iprot.readListBegin();
+                struct.fieldList = new java.util.ArrayList<java.lang.String>(_list992.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem993;
+                for (int _i994 = 0; _i994 < _list992.size; ++_i994)
                 {
-                  _elem1217 = iprot.readString();
-                  struct.fieldList.add(_elem1217);
+                  _elem993 = iprot.readString();
+                  struct.fieldList.add(_elem993);
                 }
                 iprot.readListEnd();
               }
@@ -534,9 +534,9 @@
         oprot.writeFieldBegin(FIELD_LIST_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.fieldList.size()));
-          for (java.lang.String _iter1219 : struct.fieldList)
+          for (java.lang.String _iter995 : struct.fieldList)
           {
-            oprot.writeString(_iter1219);
+            oprot.writeString(_iter995);
           }
           oprot.writeListEnd();
         }
@@ -583,9 +583,9 @@
       if (struct.isSetFieldList()) {
         {
           oprot.writeI32(struct.fieldList.size());
-          for (java.lang.String _iter1220 : struct.fieldList)
+          for (java.lang.String _iter996 : struct.fieldList)
           {
-            oprot.writeString(_iter1220);
+            oprot.writeString(_iter996);
           }
         }
       }
@@ -603,13 +603,13 @@
       java.util.BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TList _list1221 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.fieldList = new java.util.ArrayList<java.lang.String>(_list1221.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1222;
-          for (int _i1223 = 0; _i1223 < _list1221.size; ++_i1223)
+          org.apache.thrift.protocol.TList _list997 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.fieldList = new java.util.ArrayList<java.lang.String>(_list997.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem998;
+          for (int _i999 = 0; _i999 < _list997.size; ++_i999)
           {
-            _elem1222 = iprot.readString();
-            struct.fieldList.add(_elem1222);
+            _elem998 = iprot.readString();
+            struct.fieldList.add(_elem998);
           }
         }
         struct.setFieldListIsSet(true);
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableRequest.java
index 76ea13e..fe6557c 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableRequest.java
@@ -1108,13 +1108,13 @@
           case 8: // PROCESSOR_CAPABILITIES
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list992 = iprot.readListBegin();
-                struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list992.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem993;
-                for (int _i994 = 0; _i994 < _list992.size; ++_i994)
+                org.apache.thrift.protocol.TList _list1000 = iprot.readListBegin();
+                struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1000.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem1001;
+                for (int _i1002 = 0; _i1002 < _list1000.size; ++_i1002)
                 {
-                  _elem993 = iprot.readString();
-                  struct.processorCapabilities.add(_elem993);
+                  _elem1001 = iprot.readString();
+                  struct.processorCapabilities.add(_elem1001);
                 }
                 iprot.readListEnd();
               }
@@ -1201,9 +1201,9 @@
           oprot.writeFieldBegin(PROCESSOR_CAPABILITIES_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.processorCapabilities.size()));
-            for (java.lang.String _iter995 : struct.processorCapabilities)
+            for (java.lang.String _iter1003 : struct.processorCapabilities)
             {
-              oprot.writeString(_iter995);
+              oprot.writeString(_iter1003);
             }
             oprot.writeListEnd();
           }
@@ -1289,9 +1289,9 @@
       if (struct.isSetProcessorCapabilities()) {
         {
           oprot.writeI32(struct.processorCapabilities.size());
-          for (java.lang.String _iter996 : struct.processorCapabilities)
+          for (java.lang.String _iter1004 : struct.processorCapabilities)
           {
-            oprot.writeString(_iter996);
+            oprot.writeString(_iter1004);
           }
         }
       }
@@ -1333,13 +1333,13 @@
       }
       if (incoming.get(4)) {
         {
-          org.apache.thrift.protocol.TList _list997 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list997.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem998;
-          for (int _i999 = 0; _i999 < _list997.size; ++_i999)
+          org.apache.thrift.protocol.TList _list1005 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1005.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem1006;
+          for (int _i1007 = 0; _i1007 < _list1005.size; ++_i1007)
           {
-            _elem998 = iprot.readString();
-            struct.processorCapabilities.add(_elem998);
+            _elem1006 = iprot.readString();
+            struct.processorCapabilities.add(_elem1006);
           }
         }
         struct.setProcessorCapabilitiesIsSet(true);
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesExtRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesExtRequest.java
index ee754a5..2c2d98e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesExtRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesExtRequest.java
@@ -858,13 +858,13 @@
           case 6: // PROCESSOR_CAPABILITIES
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list1024 = iprot.readListBegin();
-                struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1024.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1025;
-                for (int _i1026 = 0; _i1026 < _list1024.size; ++_i1026)
+                org.apache.thrift.protocol.TList _list1032 = iprot.readListBegin();
+                struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1032.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem1033;
+                for (int _i1034 = 0; _i1034 < _list1032.size; ++_i1034)
                 {
-                  _elem1025 = iprot.readString();
-                  struct.processorCapabilities.add(_elem1025);
+                  _elem1033 = iprot.readString();
+                  struct.processorCapabilities.add(_elem1033);
                 }
                 iprot.readListEnd();
               }
@@ -922,9 +922,9 @@
           oprot.writeFieldBegin(PROCESSOR_CAPABILITIES_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.processorCapabilities.size()));
-            for (java.lang.String _iter1027 : struct.processorCapabilities)
+            for (java.lang.String _iter1035 : struct.processorCapabilities)
             {
-              oprot.writeString(_iter1027);
+              oprot.writeString(_iter1035);
             }
             oprot.writeListEnd();
           }
@@ -976,9 +976,9 @@
       if (struct.isSetProcessorCapabilities()) {
         {
           oprot.writeI32(struct.processorCapabilities.size());
-          for (java.lang.String _iter1028 : struct.processorCapabilities)
+          for (java.lang.String _iter1036 : struct.processorCapabilities)
           {
-            oprot.writeString(_iter1028);
+            oprot.writeString(_iter1036);
           }
         }
       }
@@ -1005,13 +1005,13 @@
       }
       if (incoming.get(1)) {
         {
-          org.apache.thrift.protocol.TList _list1029 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1029.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1030;
-          for (int _i1031 = 0; _i1031 < _list1029.size; ++_i1031)
+          org.apache.thrift.protocol.TList _list1037 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1037.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem1038;
+          for (int _i1039 = 0; _i1039 < _list1037.size; ++_i1039)
           {
-            _elem1030 = iprot.readString();
-            struct.processorCapabilities.add(_elem1030);
+            _elem1038 = iprot.readString();
+            struct.processorCapabilities.add(_elem1038);
           }
         }
         struct.setProcessorCapabilitiesIsSet(true);
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesRequest.java
index 18bdb4f..2058973 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesRequest.java
@@ -128,7 +128,7 @@
     tmpMap.put(_Fields.PROCESSOR_IDENTIFIER, new org.apache.thrift.meta_data.FieldMetaData("processorIdentifier", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.PROJECTION_SPEC, new org.apache.thrift.meta_data.FieldMetaData("projectionSpec", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT        , "GetProjectionsSpec")));
+        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, GetProjectionsSpec.class)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GetTablesRequest.class, metaDataMap);
   }
@@ -797,6 +797,9 @@
     if (capabilities != null) {
       capabilities.validate();
     }
+    if (projectionSpec != null) {
+      projectionSpec.validate();
+    }
   }
 
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -844,13 +847,13 @@
           case 2: // TBL_NAMES
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list1000 = iprot.readListBegin();
-                struct.tblNames = new java.util.ArrayList<java.lang.String>(_list1000.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1001;
-                for (int _i1002 = 0; _i1002 < _list1000.size; ++_i1002)
+                org.apache.thrift.protocol.TList _list1008 = iprot.readListBegin();
+                struct.tblNames = new java.util.ArrayList<java.lang.String>(_list1008.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem1009;
+                for (int _i1010 = 0; _i1010 < _list1008.size; ++_i1010)
                 {
-                  _elem1001 = iprot.readString();
-                  struct.tblNames.add(_elem1001);
+                  _elem1009 = iprot.readString();
+                  struct.tblNames.add(_elem1009);
                 }
                 iprot.readListEnd();
               }
@@ -879,13 +882,13 @@
           case 5: // PROCESSOR_CAPABILITIES
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list1003 = iprot.readListBegin();
-                struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1003.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1004;
-                for (int _i1005 = 0; _i1005 < _list1003.size; ++_i1005)
+                org.apache.thrift.protocol.TList _list1011 = iprot.readListBegin();
+                struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1011.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem1012;
+                for (int _i1013 = 0; _i1013 < _list1011.size; ++_i1013)
                 {
-                  _elem1004 = iprot.readString();
-                  struct.processorCapabilities.add(_elem1004);
+                  _elem1012 = iprot.readString();
+                  struct.processorCapabilities.add(_elem1012);
                 }
                 iprot.readListEnd();
               }
@@ -934,9 +937,9 @@
           oprot.writeFieldBegin(TBL_NAMES_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.tblNames.size()));
-            for (java.lang.String _iter1006 : struct.tblNames)
+            for (java.lang.String _iter1014 : struct.tblNames)
             {
-              oprot.writeString(_iter1006);
+              oprot.writeString(_iter1014);
             }
             oprot.writeListEnd();
           }
@@ -962,9 +965,9 @@
           oprot.writeFieldBegin(PROCESSOR_CAPABILITIES_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.processorCapabilities.size()));
-            for (java.lang.String _iter1007 : struct.processorCapabilities)
+            for (java.lang.String _iter1015 : struct.processorCapabilities)
             {
-              oprot.writeString(_iter1007);
+              oprot.writeString(_iter1015);
             }
             oprot.writeListEnd();
           }
@@ -1026,9 +1029,9 @@
       if (struct.isSetTblNames()) {
         {
           oprot.writeI32(struct.tblNames.size());
-          for (java.lang.String _iter1008 : struct.tblNames)
+          for (java.lang.String _iter1016 : struct.tblNames)
           {
-            oprot.writeString(_iter1008);
+            oprot.writeString(_iter1016);
           }
         }
       }
@@ -1041,9 +1044,9 @@
       if (struct.isSetProcessorCapabilities()) {
         {
           oprot.writeI32(struct.processorCapabilities.size());
-          for (java.lang.String _iter1009 : struct.processorCapabilities)
+          for (java.lang.String _iter1017 : struct.processorCapabilities)
           {
-            oprot.writeString(_iter1009);
+            oprot.writeString(_iter1017);
           }
         }
       }
@@ -1063,13 +1066,13 @@
       java.util.BitSet incoming = iprot.readBitSet(6);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TList _list1010 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.tblNames = new java.util.ArrayList<java.lang.String>(_list1010.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1011;
-          for (int _i1012 = 0; _i1012 < _list1010.size; ++_i1012)
+          org.apache.thrift.protocol.TList _list1018 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.tblNames = new java.util.ArrayList<java.lang.String>(_list1018.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem1019;
+          for (int _i1020 = 0; _i1020 < _list1018.size; ++_i1020)
           {
-            _elem1011 = iprot.readString();
-            struct.tblNames.add(_elem1011);
+            _elem1019 = iprot.readString();
+            struct.tblNames.add(_elem1019);
           }
         }
         struct.setTblNamesIsSet(true);
@@ -1085,13 +1088,13 @@
       }
       if (incoming.get(3)) {
         {
-          org.apache.thrift.protocol.TList _list1013 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1013.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1014;
-          for (int _i1015 = 0; _i1015 < _list1013.size; ++_i1015)
+          org.apache.thrift.protocol.TList _list1021 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.processorCapabilities = new java.util.ArrayList<java.lang.String>(_list1021.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem1022;
+          for (int _i1023 = 0; _i1023 < _list1021.size; ++_i1023)
           {
-            _elem1014 = iprot.readString();
-            struct.processorCapabilities.add(_elem1014);
+            _elem1022 = iprot.readString();
+            struct.processorCapabilities.add(_elem1022);
           }
         }
         struct.setProcessorCapabilitiesIsSet(true);
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesResult.java
index a11ed02..efcda12 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesResult.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesResult.java
@@ -331,14 +331,14 @@
           case 1: // TABLES
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list1016 = iprot.readListBegin();
-                struct.tables = new java.util.ArrayList<Table>(_list1016.size);
-                @org.apache.thrift.annotation.Nullable Table _elem1017;
-                for (int _i1018 = 0; _i1018 < _list1016.size; ++_i1018)
+                org.apache.thrift.protocol.TList _list1024 = iprot.readListBegin();
+                struct.tables = new java.util.ArrayList<Table>(_list1024.size);
+                @org.apache.thrift.annotation.Nullable Table _elem1025;
+                for (int _i1026 = 0; _i1026 < _list1024.size; ++_i1026)
                 {
-                  _elem1017 = new Table();
-                  _elem1017.read(iprot);
-                  struct.tables.add(_elem1017);
+                  _elem1025 = new Table();
+                  _elem1025.read(iprot);
+                  struct.tables.add(_elem1025);
                 }
                 iprot.readListEnd();
               }
@@ -364,9 +364,9 @@
         oprot.writeFieldBegin(TABLES_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.tables.size()));
-          for (Table _iter1019 : struct.tables)
+          for (Table _iter1027 : struct.tables)
           {
-            _iter1019.write(oprot);
+            _iter1027.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -391,9 +391,9 @@
       org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       {
         oprot.writeI32(struct.tables.size());
-        for (Table _iter1020 : struct.tables)
+        for (Table _iter1028 : struct.tables)
         {
-          _iter1020.write(oprot);
+          _iter1028.write(oprot);
         }
       }
     }
@@ -402,14 +402,14 @@
     public void read(org.apache.thrift.protocol.TProtocol prot, GetTablesResult struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       {
-        org.apache.thrift.protocol.TList _list1021 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-        struct.tables = new java.util.ArrayList<Table>(_list1021.size);
-        @org.apache.thrift.annotation.Nullable Table _elem1022;
-        for (int _i1023 = 0; _i1023 < _list1021.size; ++_i1023)
+        org.apache.thrift.protocol.TList _list1029 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+        struct.tables = new java.util.ArrayList<Table>(_list1029.size);
+        @org.apache.thrift.annotation.Nullable Table _elem1030;
+        for (int _i1031 = 0; _i1031 < _list1029.size; ++_i1031)
         {
-          _elem1022 = new Table();
-          _elem1022.read(iprot);
-          struct.tables.add(_elem1022);
+          _elem1030 = new Table();
+          _elem1030.read(iprot);
+          struct.tables.add(_elem1030);
         }
       }
       struct.setTablesIsSet(true);
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RenamePartitionRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RenamePartitionRequest.java
index 6180667..ad5851a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RenamePartitionRequest.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RenamePartitionRequest.java
@@ -773,13 +773,13 @@
           case 4: // PART_VALS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list1200 = iprot.readListBegin();
-                struct.partVals = new java.util.ArrayList<java.lang.String>(_list1200.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1201;
-                for (int _i1202 = 0; _i1202 < _list1200.size; ++_i1202)
+                org.apache.thrift.protocol.TList _list1208 = iprot.readListBegin();
+                struct.partVals = new java.util.ArrayList<java.lang.String>(_list1208.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem1209;
+                for (int _i1210 = 0; _i1210 < _list1208.size; ++_i1210)
                 {
-                  _elem1201 = iprot.readString();
-                  struct.partVals.add(_elem1201);
+                  _elem1209 = iprot.readString();
+                  struct.partVals.add(_elem1209);
                 }
                 iprot.readListEnd();
               }
@@ -839,9 +839,9 @@
         oprot.writeFieldBegin(PART_VALS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.partVals.size()));
-          for (java.lang.String _iter1203 : struct.partVals)
+          for (java.lang.String _iter1211 : struct.partVals)
           {
-            oprot.writeString(_iter1203);
+            oprot.writeString(_iter1211);
           }
           oprot.writeListEnd();
         }
@@ -880,9 +880,9 @@
       oprot.writeString(struct.tableName);
       {
         oprot.writeI32(struct.partVals.size());
-        for (java.lang.String _iter1204 : struct.partVals)
+        for (java.lang.String _iter1212 : struct.partVals)
         {
-          oprot.writeString(_iter1204);
+          oprot.writeString(_iter1212);
         }
       }
       struct.newPart.write(oprot);
@@ -910,13 +910,13 @@
       struct.tableName = iprot.readString();
       struct.setTableNameIsSet(true);
       {
-        org.apache.thrift.protocol.TList _list1205 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-        struct.partVals = new java.util.ArrayList<java.lang.String>(_list1205.size);
-        @org.apache.thrift.annotation.Nullable java.lang.String _elem1206;
-        for (int _i1207 = 0; _i1207 < _list1205.size; ++_i1207)
+        org.apache.thrift.protocol.TList _list1213 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+        struct.partVals = new java.util.ArrayList<java.lang.String>(_list1213.size);
+        @org.apache.thrift.annotation.Nullable java.lang.String _elem1214;
+        for (int _i1215 = 0; _i1215 < _list1213.size; ++_i1215)
         {
-          _elem1206 = iprot.readString();
-          struct.partVals.add(_elem1206);
+          _elem1214 = iprot.readString();
+          struct.partVals.add(_elem1214);
         }
       }
       struct.setPartValsIsSet(true);
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersion.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersion.java
index 456d2fe..09c1df0 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersion.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersion.java
@@ -1090,14 +1090,14 @@
           case 4: // COLS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list1120 = iprot.readListBegin();
-                struct.cols = new java.util.ArrayList<FieldSchema>(_list1120.size);
-                @org.apache.thrift.annotation.Nullable FieldSchema _elem1121;
-                for (int _i1122 = 0; _i1122 < _list1120.size; ++_i1122)
+                org.apache.thrift.protocol.TList _list1128 = iprot.readListBegin();
+                struct.cols = new java.util.ArrayList<FieldSchema>(_list1128.size);
+                @org.apache.thrift.annotation.Nullable FieldSchema _elem1129;
+                for (int _i1130 = 0; _i1130 < _list1128.size; ++_i1130)
                 {
-                  _elem1121 = new FieldSchema();
-                  _elem1121.read(iprot);
-                  struct.cols.add(_elem1121);
+                  _elem1129 = new FieldSchema();
+                  _elem1129.read(iprot);
+                  struct.cols.add(_elem1129);
                 }
                 iprot.readListEnd();
               }
@@ -1183,9 +1183,9 @@
         oprot.writeFieldBegin(COLS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.cols.size()));
-          for (FieldSchema _iter1123 : struct.cols)
+          for (FieldSchema _iter1131 : struct.cols)
           {
-            _iter1123.write(oprot);
+            _iter1131.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -1294,9 +1294,9 @@
       if (struct.isSetCols()) {
         {
           oprot.writeI32(struct.cols.size());
-          for (FieldSchema _iter1124 : struct.cols)
+          for (FieldSchema _iter1132 : struct.cols)
           {
-            _iter1124.write(oprot);
+            _iter1132.write(oprot);
           }
         }
       }
@@ -1339,14 +1339,14 @@
       }
       if (incoming.get(3)) {
         {
-          org.apache.thrift.protocol.TList _list1125 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.cols = new java.util.ArrayList<FieldSchema>(_list1125.size);
-          @org.apache.thrift.annotation.Nullable FieldSchema _elem1126;
-          for (int _i1127 = 0; _i1127 < _list1125.size; ++_i1127)
+          org.apache.thrift.protocol.TList _list1133 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.cols = new java.util.ArrayList<FieldSchema>(_list1133.size);
+          @org.apache.thrift.annotation.Nullable FieldSchema _elem1134;
+          for (int _i1135 = 0; _i1135 < _list1133.size; ++_i1135)
           {
-            _elem1126 = new FieldSchema();
-            _elem1126.read(iprot);
-            struct.cols.add(_elem1126);
+            _elem1134 = new FieldSchema();
+            _elem1134.read(iprot);
+            struct.cols.add(_elem1134);
           }
         }
         struct.setColsIsSet(true);
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMFullResourcePlan.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMFullResourcePlan.java
index 0269ae2..20828de 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMFullResourcePlan.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMFullResourcePlan.java
@@ -735,14 +735,14 @@
           case 2: // POOLS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list1056 = iprot.readListBegin();
-                struct.pools = new java.util.ArrayList<WMPool>(_list1056.size);
-                @org.apache.thrift.annotation.Nullable WMPool _elem1057;
-                for (int _i1058 = 0; _i1058 < _list1056.size; ++_i1058)
+                org.apache.thrift.protocol.TList _list1064 = iprot.readListBegin();
+                struct.pools = new java.util.ArrayList<WMPool>(_list1064.size);
+                @org.apache.thrift.annotation.Nullable WMPool _elem1065;
+                for (int _i1066 = 0; _i1066 < _list1064.size; ++_i1066)
                 {
-                  _elem1057 = new WMPool();
-                  _elem1057.read(iprot);
-                  struct.pools.add(_elem1057);
+                  _elem1065 = new WMPool();
+                  _elem1065.read(iprot);
+                  struct.pools.add(_elem1065);
                 }
                 iprot.readListEnd();
               }
@@ -754,14 +754,14 @@
           case 3: // MAPPINGS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list1059 = iprot.readListBegin();
-                struct.mappings = new java.util.ArrayList<WMMapping>(_list1059.size);
-                @org.apache.thrift.annotation.Nullable WMMapping _elem1060;
-                for (int _i1061 = 0; _i1061 < _list1059.size; ++_i1061)
+                org.apache.thrift.protocol.TList _list1067 = iprot.readListBegin();
+                struct.mappings = new java.util.ArrayList<WMMapping>(_list1067.size);
+                @org.apache.thrift.annotation.Nullable WMMapping _elem1068;
+                for (int _i1069 = 0; _i1069 < _list1067.size; ++_i1069)
                 {
-                  _elem1060 = new WMMapping();
-                  _elem1060.read(iprot);
-                  struct.mappings.add(_elem1060);
+                  _elem1068 = new WMMapping();
+                  _elem1068.read(iprot);
+                  struct.mappings.add(_elem1068);
                 }
                 iprot.readListEnd();
               }
@@ -773,14 +773,14 @@
           case 4: // TRIGGERS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list1062 = iprot.readListBegin();
-                struct.triggers = new java.util.ArrayList<WMTrigger>(_list1062.size);
-                @org.apache.thrift.annotation.Nullable WMTrigger _elem1063;
-                for (int _i1064 = 0; _i1064 < _list1062.size; ++_i1064)
+                org.apache.thrift.protocol.TList _list1070 = iprot.readListBegin();
+                struct.triggers = new java.util.ArrayList<WMTrigger>(_list1070.size);
+                @org.apache.thrift.annotation.Nullable WMTrigger _elem1071;
+                for (int _i1072 = 0; _i1072 < _list1070.size; ++_i1072)
                 {
-                  _elem1063 = new WMTrigger();
-                  _elem1063.read(iprot);
-                  struct.triggers.add(_elem1063);
+                  _elem1071 = new WMTrigger();
+                  _elem1071.read(iprot);
+                  struct.triggers.add(_elem1071);
                 }
                 iprot.readListEnd();
               }
@@ -792,14 +792,14 @@
           case 5: // POOL_TRIGGERS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list1065 = iprot.readListBegin();
-                struct.poolTriggers = new java.util.ArrayList<WMPoolTrigger>(_list1065.size);
-                @org.apache.thrift.annotation.Nullable WMPoolTrigger _elem1066;
-                for (int _i1067 = 0; _i1067 < _list1065.size; ++_i1067)
+                org.apache.thrift.protocol.TList _list1073 = iprot.readListBegin();
+                struct.poolTriggers = new java.util.ArrayList<WMPoolTrigger>(_list1073.size);
+                @org.apache.thrift.annotation.Nullable WMPoolTrigger _elem1074;
+                for (int _i1075 = 0; _i1075 < _list1073.size; ++_i1075)
                 {
-                  _elem1066 = new WMPoolTrigger();
-                  _elem1066.read(iprot);
-                  struct.poolTriggers.add(_elem1066);
+                  _elem1074 = new WMPoolTrigger();
+                  _elem1074.read(iprot);
+                  struct.poolTriggers.add(_elem1074);
                 }
                 iprot.readListEnd();
               }
@@ -830,9 +830,9 @@
         oprot.writeFieldBegin(POOLS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.pools.size()));
-          for (WMPool _iter1068 : struct.pools)
+          for (WMPool _iter1076 : struct.pools)
           {
-            _iter1068.write(oprot);
+            _iter1076.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -843,9 +843,9 @@
           oprot.writeFieldBegin(MAPPINGS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.mappings.size()));
-            for (WMMapping _iter1069 : struct.mappings)
+            for (WMMapping _iter1077 : struct.mappings)
             {
-              _iter1069.write(oprot);
+              _iter1077.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -857,9 +857,9 @@
           oprot.writeFieldBegin(TRIGGERS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.triggers.size()));
-            for (WMTrigger _iter1070 : struct.triggers)
+            for (WMTrigger _iter1078 : struct.triggers)
             {
-              _iter1070.write(oprot);
+              _iter1078.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -871,9 +871,9 @@
           oprot.writeFieldBegin(POOL_TRIGGERS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.poolTriggers.size()));
-            for (WMPoolTrigger _iter1071 : struct.poolTriggers)
+            for (WMPoolTrigger _iter1079 : struct.poolTriggers)
             {
-              _iter1071.write(oprot);
+              _iter1079.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -900,9 +900,9 @@
       struct.plan.write(oprot);
       {
         oprot.writeI32(struct.pools.size());
-        for (WMPool _iter1072 : struct.pools)
+        for (WMPool _iter1080 : struct.pools)
         {
-          _iter1072.write(oprot);
+          _iter1080.write(oprot);
         }
       }
       java.util.BitSet optionals = new java.util.BitSet();
@@ -919,27 +919,27 @@
       if (struct.isSetMappings()) {
         {
           oprot.writeI32(struct.mappings.size());
-          for (WMMapping _iter1073 : struct.mappings)
+          for (WMMapping _iter1081 : struct.mappings)
           {
-            _iter1073.write(oprot);
+            _iter1081.write(oprot);
           }
         }
       }
       if (struct.isSetTriggers()) {
         {
           oprot.writeI32(struct.triggers.size());
-          for (WMTrigger _iter1074 : struct.triggers)
+          for (WMTrigger _iter1082 : struct.triggers)
           {
-            _iter1074.write(oprot);
+            _iter1082.write(oprot);
           }
         }
       }
       if (struct.isSetPoolTriggers()) {
         {
           oprot.writeI32(struct.poolTriggers.size());
-          for (WMPoolTrigger _iter1075 : struct.poolTriggers)
+          for (WMPoolTrigger _iter1083 : struct.poolTriggers)
           {
-            _iter1075.write(oprot);
+            _iter1083.write(oprot);
           }
         }
       }
@@ -952,56 +952,56 @@
       struct.plan.read(iprot);
       struct.setPlanIsSet(true);
       {
-        org.apache.thrift.protocol.TList _list1076 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-        struct.pools = new java.util.ArrayList<WMPool>(_list1076.size);
-        @org.apache.thrift.annotation.Nullable WMPool _elem1077;
-        for (int _i1078 = 0; _i1078 < _list1076.size; ++_i1078)
+        org.apache.thrift.protocol.TList _list1084 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+        struct.pools = new java.util.ArrayList<WMPool>(_list1084.size);
+        @org.apache.thrift.annotation.Nullable WMPool _elem1085;
+        for (int _i1086 = 0; _i1086 < _list1084.size; ++_i1086)
         {
-          _elem1077 = new WMPool();
-          _elem1077.read(iprot);
-          struct.pools.add(_elem1077);
+          _elem1085 = new WMPool();
+          _elem1085.read(iprot);
+          struct.pools.add(_elem1085);
         }
       }
       struct.setPoolsIsSet(true);
       java.util.BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TList _list1079 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.mappings = new java.util.ArrayList<WMMapping>(_list1079.size);
-          @org.apache.thrift.annotation.Nullable WMMapping _elem1080;
-          for (int _i1081 = 0; _i1081 < _list1079.size; ++_i1081)
+          org.apache.thrift.protocol.TList _list1087 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.mappings = new java.util.ArrayList<WMMapping>(_list1087.size);
+          @org.apache.thrift.annotation.Nullable WMMapping _elem1088;
+          for (int _i1089 = 0; _i1089 < _list1087.size; ++_i1089)
           {
-            _elem1080 = new WMMapping();
-            _elem1080.read(iprot);
-            struct.mappings.add(_elem1080);
+            _elem1088 = new WMMapping();
+            _elem1088.read(iprot);
+            struct.mappings.add(_elem1088);
           }
         }
         struct.setMappingsIsSet(true);
       }
       if (incoming.get(1)) {
         {
-          org.apache.thrift.protocol.TList _list1082 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.triggers = new java.util.ArrayList<WMTrigger>(_list1082.size);
-          @org.apache.thrift.annotation.Nullable WMTrigger _elem1083;
-          for (int _i1084 = 0; _i1084 < _list1082.size; ++_i1084)
+          org.apache.thrift.protocol.TList _list1090 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.triggers = new java.util.ArrayList<WMTrigger>(_list1090.size);
+          @org.apache.thrift.annotation.Nullable WMTrigger _elem1091;
+          for (int _i1092 = 0; _i1092 < _list1090.size; ++_i1092)
           {
-            _elem1083 = new WMTrigger();
-            _elem1083.read(iprot);
-            struct.triggers.add(_elem1083);
+            _elem1091 = new WMTrigger();
+            _elem1091.read(iprot);
+            struct.triggers.add(_elem1091);
           }
         }
         struct.setTriggersIsSet(true);
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TList _list1085 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.poolTriggers = new java.util.ArrayList<WMPoolTrigger>(_list1085.size);
-          @org.apache.thrift.annotation.Nullable WMPoolTrigger _elem1086;
-          for (int _i1087 = 0; _i1087 < _list1085.size; ++_i1087)
+          org.apache.thrift.protocol.TList _list1093 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.poolTriggers = new java.util.ArrayList<WMPoolTrigger>(_list1093.size);
+          @org.apache.thrift.annotation.Nullable WMPoolTrigger _elem1094;
+          for (int _i1095 = 0; _i1095 < _list1093.size; ++_i1095)
           {
-            _elem1086 = new WMPoolTrigger();
-            _elem1086.read(iprot);
-            struct.poolTriggers.add(_elem1086);
+            _elem1094 = new WMPoolTrigger();
+            _elem1094.read(iprot);
+            struct.poolTriggers.add(_elem1094);
           }
         }
         struct.setPoolTriggersIsSet(true);
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetAllResourcePlanResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetAllResourcePlanResponse.java
index b202484..af231cc 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetAllResourcePlanResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetAllResourcePlanResponse.java
@@ -323,14 +323,14 @@
           case 1: // RESOURCE_PLANS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list1088 = iprot.readListBegin();
-                struct.resourcePlans = new java.util.ArrayList<WMResourcePlan>(_list1088.size);
-                @org.apache.thrift.annotation.Nullable WMResourcePlan _elem1089;
-                for (int _i1090 = 0; _i1090 < _list1088.size; ++_i1090)
+                org.apache.thrift.protocol.TList _list1096 = iprot.readListBegin();
+                struct.resourcePlans = new java.util.ArrayList<WMResourcePlan>(_list1096.size);
+                @org.apache.thrift.annotation.Nullable WMResourcePlan _elem1097;
+                for (int _i1098 = 0; _i1098 < _list1096.size; ++_i1098)
                 {
-                  _elem1089 = new WMResourcePlan();
-                  _elem1089.read(iprot);
-                  struct.resourcePlans.add(_elem1089);
+                  _elem1097 = new WMResourcePlan();
+                  _elem1097.read(iprot);
+                  struct.resourcePlans.add(_elem1097);
                 }
                 iprot.readListEnd();
               }
@@ -357,9 +357,9 @@
           oprot.writeFieldBegin(RESOURCE_PLANS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.resourcePlans.size()));
-            for (WMResourcePlan _iter1091 : struct.resourcePlans)
+            for (WMResourcePlan _iter1099 : struct.resourcePlans)
             {
-              _iter1091.write(oprot);
+              _iter1099.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -391,9 +391,9 @@
       if (struct.isSetResourcePlans()) {
         {
           oprot.writeI32(struct.resourcePlans.size());
-          for (WMResourcePlan _iter1092 : struct.resourcePlans)
+          for (WMResourcePlan _iter1100 : struct.resourcePlans)
           {
-            _iter1092.write(oprot);
+            _iter1100.write(oprot);
           }
         }
       }
@@ -405,14 +405,14 @@
       java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TList _list1093 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.resourcePlans = new java.util.ArrayList<WMResourcePlan>(_list1093.size);
-          @org.apache.thrift.annotation.Nullable WMResourcePlan _elem1094;
-          for (int _i1095 = 0; _i1095 < _list1093.size; ++_i1095)
+          org.apache.thrift.protocol.TList _list1101 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.resourcePlans = new java.util.ArrayList<WMResourcePlan>(_list1101.size);
+          @org.apache.thrift.annotation.Nullable WMResourcePlan _elem1102;
+          for (int _i1103 = 0; _i1103 < _list1101.size; ++_i1103)
           {
-            _elem1094 = new WMResourcePlan();
-            _elem1094.read(iprot);
-            struct.resourcePlans.add(_elem1094);
+            _elem1102 = new WMResourcePlan();
+            _elem1102.read(iprot);
+            struct.resourcePlans.add(_elem1102);
           }
         }
         struct.setResourcePlansIsSet(true);
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetTriggersForResourePlanResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetTriggersForResourePlanResponse.java
index 966e4f6..eadecde 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetTriggersForResourePlanResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetTriggersForResourePlanResponse.java
@@ -323,14 +323,14 @@
           case 1: // TRIGGERS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list1112 = iprot.readListBegin();
-                struct.triggers = new java.util.ArrayList<WMTrigger>(_list1112.size);
-                @org.apache.thrift.annotation.Nullable WMTrigger _elem1113;
-                for (int _i1114 = 0; _i1114 < _list1112.size; ++_i1114)
+                org.apache.thrift.protocol.TList _list1120 = iprot.readListBegin();
+                struct.triggers = new java.util.ArrayList<WMTrigger>(_list1120.size);
+                @org.apache.thrift.annotation.Nullable WMTrigger _elem1121;
+                for (int _i1122 = 0; _i1122 < _list1120.size; ++_i1122)
                 {
-                  _elem1113 = new WMTrigger();
-                  _elem1113.read(iprot);
-                  struct.triggers.add(_elem1113);
+                  _elem1121 = new WMTrigger();
+                  _elem1121.read(iprot);
+                  struct.triggers.add(_elem1121);
                 }
                 iprot.readListEnd();
               }
@@ -357,9 +357,9 @@
           oprot.writeFieldBegin(TRIGGERS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.triggers.size()));
-            for (WMTrigger _iter1115 : struct.triggers)
+            for (WMTrigger _iter1123 : struct.triggers)
             {
-              _iter1115.write(oprot);
+              _iter1123.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -391,9 +391,9 @@
       if (struct.isSetTriggers()) {
         {
           oprot.writeI32(struct.triggers.size());
-          for (WMTrigger _iter1116 : struct.triggers)
+          for (WMTrigger _iter1124 : struct.triggers)
           {
-            _iter1116.write(oprot);
+            _iter1124.write(oprot);
           }
         }
       }
@@ -405,14 +405,14 @@
       java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TList _list1117 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.triggers = new java.util.ArrayList<WMTrigger>(_list1117.size);
-          @org.apache.thrift.annotation.Nullable WMTrigger _elem1118;
-          for (int _i1119 = 0; _i1119 < _list1117.size; ++_i1119)
+          org.apache.thrift.protocol.TList _list1125 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.triggers = new java.util.ArrayList<WMTrigger>(_list1125.size);
+          @org.apache.thrift.annotation.Nullable WMTrigger _elem1126;
+          for (int _i1127 = 0; _i1127 < _list1125.size; ++_i1127)
           {
-            _elem1118 = new WMTrigger();
-            _elem1118.read(iprot);
-            struct.triggers.add(_elem1118);
+            _elem1126 = new WMTrigger();
+            _elem1126.read(iprot);
+            struct.triggers.add(_elem1126);
           }
         }
         struct.setTriggersIsSet(true);
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMValidateResourcePlanResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMValidateResourcePlanResponse.java
index 337560d..58a2d1a 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMValidateResourcePlanResponse.java
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMValidateResourcePlanResponse.java
@@ -419,13 +419,13 @@
           case 1: // ERRORS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list1096 = iprot.readListBegin();
-                struct.errors = new java.util.ArrayList<java.lang.String>(_list1096.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1097;
-                for (int _i1098 = 0; _i1098 < _list1096.size; ++_i1098)
+                org.apache.thrift.protocol.TList _list1104 = iprot.readListBegin();
+                struct.errors = new java.util.ArrayList<java.lang.String>(_list1104.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem1105;
+                for (int _i1106 = 0; _i1106 < _list1104.size; ++_i1106)
                 {
-                  _elem1097 = iprot.readString();
-                  struct.errors.add(_elem1097);
+                  _elem1105 = iprot.readString();
+                  struct.errors.add(_elem1105);
                 }
                 iprot.readListEnd();
               }
@@ -437,13 +437,13 @@
           case 2: // WARNINGS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list1099 = iprot.readListBegin();
-                struct.warnings = new java.util.ArrayList<java.lang.String>(_list1099.size);
-                @org.apache.thrift.annotation.Nullable java.lang.String _elem1100;
-                for (int _i1101 = 0; _i1101 < _list1099.size; ++_i1101)
+                org.apache.thrift.protocol.TList _list1107 = iprot.readListBegin();
+                struct.warnings = new java.util.ArrayList<java.lang.String>(_list1107.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem1108;
+                for (int _i1109 = 0; _i1109 < _list1107.size; ++_i1109)
                 {
-                  _elem1100 = iprot.readString();
-                  struct.warnings.add(_elem1100);
+                  _elem1108 = iprot.readString();
+                  struct.warnings.add(_elem1108);
                 }
                 iprot.readListEnd();
               }
@@ -470,9 +470,9 @@
           oprot.writeFieldBegin(ERRORS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.errors.size()));
-            for (java.lang.String _iter1102 : struct.errors)
+            for (java.lang.String _iter1110 : struct.errors)
             {
-              oprot.writeString(_iter1102);
+              oprot.writeString(_iter1110);
             }
             oprot.writeListEnd();
           }
@@ -484,9 +484,9 @@
           oprot.writeFieldBegin(WARNINGS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.warnings.size()));
-            for (java.lang.String _iter1103 : struct.warnings)
+            for (java.lang.String _iter1111 : struct.warnings)
             {
-              oprot.writeString(_iter1103);
+              oprot.writeString(_iter1111);
             }
             oprot.writeListEnd();
           }
@@ -521,18 +521,18 @@
       if (struct.isSetErrors()) {
         {
           oprot.writeI32(struct.errors.size());
-          for (java.lang.String _iter1104 : struct.errors)
+          for (java.lang.String _iter1112 : struct.errors)
           {
-            oprot.writeString(_iter1104);
+            oprot.writeString(_iter1112);
           }
         }
       }
       if (struct.isSetWarnings()) {
         {
           oprot.writeI32(struct.warnings.size());
-          for (java.lang.String _iter1105 : struct.warnings)
+          for (java.lang.String _iter1113 : struct.warnings)
           {
-            oprot.writeString(_iter1105);
+            oprot.writeString(_iter1113);
           }
         }
       }
@@ -544,26 +544,26 @@
       java.util.BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TList _list1106 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.errors = new java.util.ArrayList<java.lang.String>(_list1106.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1107;
-          for (int _i1108 = 0; _i1108 < _list1106.size; ++_i1108)
+          org.apache.thrift.protocol.TList _list1114 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.errors = new java.util.ArrayList<java.lang.String>(_list1114.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem1115;
+          for (int _i1116 = 0; _i1116 < _list1114.size; ++_i1116)
           {
-            _elem1107 = iprot.readString();
-            struct.errors.add(_elem1107);
+            _elem1115 = iprot.readString();
+            struct.errors.add(_elem1115);
           }
         }
         struct.setErrorsIsSet(true);
       }
       if (incoming.get(1)) {
         {
-          org.apache.thrift.protocol.TList _list1109 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.warnings = new java.util.ArrayList<java.lang.String>(_list1109.size);
-          @org.apache.thrift.annotation.Nullable java.lang.String _elem1110;
-          for (int _i1111 = 0; _i1111 < _list1109.size; ++_i1111)
+          org.apache.thrift.protocol.TList _list1117 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.warnings = new java.util.ArrayList<java.lang.String>(_list1117.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem1118;
+          for (int _i1119 = 0; _i1119 < _list1117.size; ++_i1119)
           {
-            _elem1110 = iprot.readString();
-            struct.warnings.add(_elem1110);
+            _elem1118 = iprot.readString();
+            struct.warnings.add(_elem1118);
           }
         }
         struct.setWarningsIsSet(true);
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterPartitionsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterPartitionsRequest.php
index 457c8a5..3211e6f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterPartitionsRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterPartitionsRequest.php
@@ -163,14 +163,14 @@
                 case 4:
                     if ($ftype == TType::LST) {
                         $this->partitions = array();
-                        $_size1050 = 0;
-                        $_etype1053 = 0;
-                        $xfer += $input->readListBegin($_etype1053, $_size1050);
-                        for ($_i1054 = 0; $_i1054 < $_size1050; ++$_i1054) {
-                            $elem1055 = null;
-                            $elem1055 = new \metastore\Partition();
-                            $xfer += $elem1055->read($input);
-                            $this->partitions []= $elem1055;
+                        $_size1057 = 0;
+                        $_etype1060 = 0;
+                        $xfer += $input->readListBegin($_etype1060, $_size1057);
+                        for ($_i1061 = 0; $_i1061 < $_size1057; ++$_i1061) {
+                            $elem1062 = null;
+                            $elem1062 = new \metastore\Partition();
+                            $xfer += $elem1062->read($input);
+                            $this->partitions []= $elem1062;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -234,8 +234,8 @@
             }
             $xfer += $output->writeFieldBegin('partitions', TType::LST, 4);
             $output->writeListBegin(TType::STRUCT, count($this->partitions));
-            foreach ($this->partitions as $iter1056) {
-                $xfer += $iter1056->write($output);
+            foreach ($this->partitions as $iter1063) {
+                $xfer += $iter1063->write($output);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterTableRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterTableRequest.php
index d40c152..7bcd76e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterTableRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AlterTableRequest.php
@@ -217,13 +217,13 @@
                 case 8:
                     if ($ftype == TType::LST) {
                         $this->processorCapabilities = array();
-                        $_size1064 = 0;
-                        $_etype1067 = 0;
-                        $xfer += $input->readListBegin($_etype1067, $_size1064);
-                        for ($_i1068 = 0; $_i1068 < $_size1064; ++$_i1068) {
-                            $elem1069 = null;
-                            $xfer += $input->readString($elem1069);
-                            $this->processorCapabilities []= $elem1069;
+                        $_size1071 = 0;
+                        $_etype1074 = 0;
+                        $xfer += $input->readListBegin($_etype1074, $_size1071);
+                        for ($_i1075 = 0; $_i1075 < $_size1071; ++$_i1075) {
+                            $elem1076 = null;
+                            $xfer += $input->readString($elem1076);
+                            $this->processorCapabilities []= $elem1076;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -298,8 +298,8 @@
             }
             $xfer += $output->writeFieldBegin('processorCapabilities', TType::LST, 8);
             $output->writeListBegin(TType::STRING, count($this->processorCapabilities));
-            foreach ($this->processorCapabilities as $iter1070) {
-                $xfer += $output->writeString($iter1070);
+            foreach ($this->processorCapabilities as $iter1077) {
+                $xfer += $output->writeString($iter1077);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CreateTableRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CreateTableRequest.php
index 8975b16..a80f46f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CreateTableRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CreateTableRequest.php
@@ -224,14 +224,14 @@
                 case 3:
                     if ($ftype == TType::LST) {
                         $this->primaryKeys = array();
-                        $_size1001 = 0;
-                        $_etype1004 = 0;
-                        $xfer += $input->readListBegin($_etype1004, $_size1001);
-                        for ($_i1005 = 0; $_i1005 < $_size1001; ++$_i1005) {
-                            $elem1006 = null;
-                            $elem1006 = new \metastore\SQLPrimaryKey();
-                            $xfer += $elem1006->read($input);
-                            $this->primaryKeys []= $elem1006;
+                        $_size1008 = 0;
+                        $_etype1011 = 0;
+                        $xfer += $input->readListBegin($_etype1011, $_size1008);
+                        for ($_i1012 = 0; $_i1012 < $_size1008; ++$_i1012) {
+                            $elem1013 = null;
+                            $elem1013 = new \metastore\SQLPrimaryKey();
+                            $xfer += $elem1013->read($input);
+                            $this->primaryKeys []= $elem1013;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -241,14 +241,14 @@
                 case 4:
                     if ($ftype == TType::LST) {
                         $this->foreignKeys = array();
-                        $_size1007 = 0;
-                        $_etype1010 = 0;
-                        $xfer += $input->readListBegin($_etype1010, $_size1007);
-                        for ($_i1011 = 0; $_i1011 < $_size1007; ++$_i1011) {
-                            $elem1012 = null;
-                            $elem1012 = new \metastore\SQLForeignKey();
-                            $xfer += $elem1012->read($input);
-                            $this->foreignKeys []= $elem1012;
+                        $_size1014 = 0;
+                        $_etype1017 = 0;
+                        $xfer += $input->readListBegin($_etype1017, $_size1014);
+                        for ($_i1018 = 0; $_i1018 < $_size1014; ++$_i1018) {
+                            $elem1019 = null;
+                            $elem1019 = new \metastore\SQLForeignKey();
+                            $xfer += $elem1019->read($input);
+                            $this->foreignKeys []= $elem1019;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -258,14 +258,14 @@
                 case 5:
                     if ($ftype == TType::LST) {
                         $this->uniqueConstraints = array();
-                        $_size1013 = 0;
-                        $_etype1016 = 0;
-                        $xfer += $input->readListBegin($_etype1016, $_size1013);
-                        for ($_i1017 = 0; $_i1017 < $_size1013; ++$_i1017) {
-                            $elem1018 = null;
-                            $elem1018 = new \metastore\SQLUniqueConstraint();
-                            $xfer += $elem1018->read($input);
-                            $this->uniqueConstraints []= $elem1018;
+                        $_size1020 = 0;
+                        $_etype1023 = 0;
+                        $xfer += $input->readListBegin($_etype1023, $_size1020);
+                        for ($_i1024 = 0; $_i1024 < $_size1020; ++$_i1024) {
+                            $elem1025 = null;
+                            $elem1025 = new \metastore\SQLUniqueConstraint();
+                            $xfer += $elem1025->read($input);
+                            $this->uniqueConstraints []= $elem1025;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -275,14 +275,14 @@
                 case 6:
                     if ($ftype == TType::LST) {
                         $this->notNullConstraints = array();
-                        $_size1019 = 0;
-                        $_etype1022 = 0;
-                        $xfer += $input->readListBegin($_etype1022, $_size1019);
-                        for ($_i1023 = 0; $_i1023 < $_size1019; ++$_i1023) {
-                            $elem1024 = null;
-                            $elem1024 = new \metastore\SQLNotNullConstraint();
-                            $xfer += $elem1024->read($input);
-                            $this->notNullConstraints []= $elem1024;
+                        $_size1026 = 0;
+                        $_etype1029 = 0;
+                        $xfer += $input->readListBegin($_etype1029, $_size1026);
+                        for ($_i1030 = 0; $_i1030 < $_size1026; ++$_i1030) {
+                            $elem1031 = null;
+                            $elem1031 = new \metastore\SQLNotNullConstraint();
+                            $xfer += $elem1031->read($input);
+                            $this->notNullConstraints []= $elem1031;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -292,14 +292,14 @@
                 case 7:
                     if ($ftype == TType::LST) {
                         $this->defaultConstraints = array();
-                        $_size1025 = 0;
-                        $_etype1028 = 0;
-                        $xfer += $input->readListBegin($_etype1028, $_size1025);
-                        for ($_i1029 = 0; $_i1029 < $_size1025; ++$_i1029) {
-                            $elem1030 = null;
-                            $elem1030 = new \metastore\SQLDefaultConstraint();
-                            $xfer += $elem1030->read($input);
-                            $this->defaultConstraints []= $elem1030;
+                        $_size1032 = 0;
+                        $_etype1035 = 0;
+                        $xfer += $input->readListBegin($_etype1035, $_size1032);
+                        for ($_i1036 = 0; $_i1036 < $_size1032; ++$_i1036) {
+                            $elem1037 = null;
+                            $elem1037 = new \metastore\SQLDefaultConstraint();
+                            $xfer += $elem1037->read($input);
+                            $this->defaultConstraints []= $elem1037;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -309,14 +309,14 @@
                 case 8:
                     if ($ftype == TType::LST) {
                         $this->checkConstraints = array();
-                        $_size1031 = 0;
-                        $_etype1034 = 0;
-                        $xfer += $input->readListBegin($_etype1034, $_size1031);
-                        for ($_i1035 = 0; $_i1035 < $_size1031; ++$_i1035) {
-                            $elem1036 = null;
-                            $elem1036 = new \metastore\SQLCheckConstraint();
-                            $xfer += $elem1036->read($input);
-                            $this->checkConstraints []= $elem1036;
+                        $_size1038 = 0;
+                        $_etype1041 = 0;
+                        $xfer += $input->readListBegin($_etype1041, $_size1038);
+                        for ($_i1042 = 0; $_i1042 < $_size1038; ++$_i1042) {
+                            $elem1043 = null;
+                            $elem1043 = new \metastore\SQLCheckConstraint();
+                            $xfer += $elem1043->read($input);
+                            $this->checkConstraints []= $elem1043;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -326,13 +326,13 @@
                 case 9:
                     if ($ftype == TType::LST) {
                         $this->processorCapabilities = array();
-                        $_size1037 = 0;
-                        $_etype1040 = 0;
-                        $xfer += $input->readListBegin($_etype1040, $_size1037);
-                        for ($_i1041 = 0; $_i1041 < $_size1037; ++$_i1041) {
-                            $elem1042 = null;
-                            $xfer += $input->readString($elem1042);
-                            $this->processorCapabilities []= $elem1042;
+                        $_size1044 = 0;
+                        $_etype1047 = 0;
+                        $xfer += $input->readListBegin($_etype1047, $_size1044);
+                        for ($_i1048 = 0; $_i1048 < $_size1044; ++$_i1048) {
+                            $elem1049 = null;
+                            $xfer += $input->readString($elem1049);
+                            $this->processorCapabilities []= $elem1049;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -382,8 +382,8 @@
             }
             $xfer += $output->writeFieldBegin('primaryKeys', TType::LST, 3);
             $output->writeListBegin(TType::STRUCT, count($this->primaryKeys));
-            foreach ($this->primaryKeys as $iter1043) {
-                $xfer += $iter1043->write($output);
+            foreach ($this->primaryKeys as $iter1050) {
+                $xfer += $iter1050->write($output);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
@@ -394,8 +394,8 @@
             }
             $xfer += $output->writeFieldBegin('foreignKeys', TType::LST, 4);
             $output->writeListBegin(TType::STRUCT, count($this->foreignKeys));
-            foreach ($this->foreignKeys as $iter1044) {
-                $xfer += $iter1044->write($output);
+            foreach ($this->foreignKeys as $iter1051) {
+                $xfer += $iter1051->write($output);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
@@ -406,8 +406,8 @@
             }
             $xfer += $output->writeFieldBegin('uniqueConstraints', TType::LST, 5);
             $output->writeListBegin(TType::STRUCT, count($this->uniqueConstraints));
-            foreach ($this->uniqueConstraints as $iter1045) {
-                $xfer += $iter1045->write($output);
+            foreach ($this->uniqueConstraints as $iter1052) {
+                $xfer += $iter1052->write($output);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
@@ -418,8 +418,8 @@
             }
             $xfer += $output->writeFieldBegin('notNullConstraints', TType::LST, 6);
             $output->writeListBegin(TType::STRUCT, count($this->notNullConstraints));
-            foreach ($this->notNullConstraints as $iter1046) {
-                $xfer += $iter1046->write($output);
+            foreach ($this->notNullConstraints as $iter1053) {
+                $xfer += $iter1053->write($output);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
@@ -430,8 +430,8 @@
             }
             $xfer += $output->writeFieldBegin('defaultConstraints', TType::LST, 7);
             $output->writeListBegin(TType::STRUCT, count($this->defaultConstraints));
-            foreach ($this->defaultConstraints as $iter1047) {
-                $xfer += $iter1047->write($output);
+            foreach ($this->defaultConstraints as $iter1054) {
+                $xfer += $iter1054->write($output);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
@@ -442,8 +442,8 @@
             }
             $xfer += $output->writeFieldBegin('checkConstraints', TType::LST, 8);
             $output->writeListBegin(TType::STRUCT, count($this->checkConstraints));
-            foreach ($this->checkConstraints as $iter1048) {
-                $xfer += $iter1048->write($output);
+            foreach ($this->checkConstraints as $iter1055) {
+                $xfer += $iter1055->write($output);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
@@ -454,8 +454,8 @@
             }
             $xfer += $output->writeFieldBegin('processorCapabilities', TType::LST, 9);
             $output->writeListBegin(TType::STRING, count($this->processorCapabilities));
-            foreach ($this->processorCapabilities as $iter1049) {
-                $xfer += $output->writeString($iter1049);
+            foreach ($this->processorCapabilities as $iter1056) {
+                $xfer += $output->writeString($iter1056);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ExtendedTableInfo.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ExtendedTableInfo.php
index 8a4fd83..671feae 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ExtendedTableInfo.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ExtendedTableInfo.php
@@ -122,13 +122,13 @@
                 case 3:
                     if ($ftype == TType::LST) {
                         $this->requiredReadCapabilities = array();
-                        $_size910 = 0;
-                        $_etype913 = 0;
-                        $xfer += $input->readListBegin($_etype913, $_size910);
-                        for ($_i914 = 0; $_i914 < $_size910; ++$_i914) {
-                            $elem915 = null;
-                            $xfer += $input->readString($elem915);
-                            $this->requiredReadCapabilities []= $elem915;
+                        $_size917 = 0;
+                        $_etype920 = 0;
+                        $xfer += $input->readListBegin($_etype920, $_size917);
+                        for ($_i921 = 0; $_i921 < $_size917; ++$_i921) {
+                            $elem922 = null;
+                            $xfer += $input->readString($elem922);
+                            $this->requiredReadCapabilities []= $elem922;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -138,13 +138,13 @@
                 case 4:
                     if ($ftype == TType::LST) {
                         $this->requiredWriteCapabilities = array();
-                        $_size916 = 0;
-                        $_etype919 = 0;
-                        $xfer += $input->readListBegin($_etype919, $_size916);
-                        for ($_i920 = 0; $_i920 < $_size916; ++$_i920) {
-                            $elem921 = null;
-                            $xfer += $input->readString($elem921);
-                            $this->requiredWriteCapabilities []= $elem921;
+                        $_size923 = 0;
+                        $_etype926 = 0;
+                        $xfer += $input->readListBegin($_etype926, $_size923);
+                        for ($_i927 = 0; $_i927 < $_size923; ++$_i927) {
+                            $elem928 = null;
+                            $xfer += $input->readString($elem928);
+                            $this->requiredWriteCapabilities []= $elem928;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -181,8 +181,8 @@
             }
             $xfer += $output->writeFieldBegin('requiredReadCapabilities', TType::LST, 3);
             $output->writeListBegin(TType::STRING, count($this->requiredReadCapabilities));
-            foreach ($this->requiredReadCapabilities as $iter922) {
-                $xfer += $output->writeString($iter922);
+            foreach ($this->requiredReadCapabilities as $iter929) {
+                $xfer += $output->writeString($iter929);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
@@ -193,8 +193,8 @@
             }
             $xfer += $output->writeFieldBegin('requiredWriteCapabilities', TType::LST, 4);
             $output->writeListBegin(TType::STRING, count($this->requiredWriteCapabilities));
-            foreach ($this->requiredWriteCapabilities as $iter923) {
-                $xfer += $output->writeString($iter923);
+            foreach ($this->requiredWriteCapabilities as $iter930) {
+                $xfer += $output->writeString($iter930);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FindSchemasByColsResp.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FindSchemasByColsResp.php
index eb636d2..0db608e 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FindSchemasByColsResp.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/FindSchemasByColsResp.php
@@ -69,14 +69,14 @@
                 case 1:
                     if ($ftype == TType::LST) {
                         $this->schemaVersions = array();
-                        $_size994 = 0;
-                        $_etype997 = 0;
-                        $xfer += $input->readListBegin($_etype997, $_size994);
-                        for ($_i998 = 0; $_i998 < $_size994; ++$_i998) {
-                            $elem999 = null;
-                            $elem999 = new \metastore\SchemaVersionDescriptor();
-                            $xfer += $elem999->read($input);
-                            $this->schemaVersions []= $elem999;
+                        $_size1001 = 0;
+                        $_etype1004 = 0;
+                        $xfer += $input->readListBegin($_etype1004, $_size1001);
+                        for ($_i1005 = 0; $_i1005 < $_size1001; ++$_i1005) {
+                            $elem1006 = null;
+                            $elem1006 = new \metastore\SchemaVersionDescriptor();
+                            $xfer += $elem1006->read($input);
+                            $this->schemaVersions []= $elem1006;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -103,8 +103,8 @@
             }
             $xfer += $output->writeFieldBegin('schemaVersions', TType::LST, 1);
             $output->writeListBegin(TType::STRUCT, count($this->schemaVersions));
-            foreach ($this->schemaVersions as $iter1000) {
-                $xfer += $iter1000->write($output);
+            foreach ($this->schemaVersions as $iter1007) {
+                $xfer += $iter1007->write($output);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetDatabaseRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetDatabaseRequest.php
index 0de8598..5e7b959 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetDatabaseRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetDatabaseRequest.php
@@ -118,13 +118,13 @@
                 case 3:
                     if ($ftype == TType::LST) {
                         $this->processorCapabilities = array();
-                        $_size924 = 0;
-                        $_etype927 = 0;
-                        $xfer += $input->readListBegin($_etype927, $_size924);
-                        for ($_i928 = 0; $_i928 < $_size924; ++$_i928) {
-                            $elem929 = null;
-                            $xfer += $input->readString($elem929);
-                            $this->processorCapabilities []= $elem929;
+                        $_size931 = 0;
+                        $_etype934 = 0;
+                        $xfer += $input->readListBegin($_etype934, $_size931);
+                        for ($_i935 = 0; $_i935 < $_size931; ++$_i935) {
+                            $elem936 = null;
+                            $xfer += $input->readString($elem936);
+                            $this->processorCapabilities []= $elem936;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -168,8 +168,8 @@
             }
             $xfer += $output->writeFieldBegin('processorCapabilities', TType::LST, 3);
             $output->writeListBegin(TType::STRING, count($this->processorCapabilities));
-            foreach ($this->processorCapabilities as $iter930) {
-                $xfer += $output->writeString($iter930);
+            foreach ($this->processorCapabilities as $iter937) {
+                $xfer += $output->writeString($iter937);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetProjectionsSpec.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetProjectionsSpec.php
index cbc7e4a..164a4f9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetProjectionsSpec.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetProjectionsSpec.php
@@ -92,13 +92,13 @@
                 case 1:
                     if ($ftype == TType::LST) {
                         $this->fieldList = array();
-                        $_size1071 = 0;
-                        $_etype1074 = 0;
-                        $xfer += $input->readListBegin($_etype1074, $_size1071);
-                        for ($_i1075 = 0; $_i1075 < $_size1071; ++$_i1075) {
-                            $elem1076 = null;
-                            $xfer += $input->readString($elem1076);
-                            $this->fieldList []= $elem1076;
+                        $_size875 = 0;
+                        $_etype878 = 0;
+                        $xfer += $input->readListBegin($_etype878, $_size875);
+                        for ($_i879 = 0; $_i879 < $_size875; ++$_i879) {
+                            $elem880 = null;
+                            $xfer += $input->readString($elem880);
+                            $this->fieldList []= $elem880;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -139,8 +139,8 @@
             }
             $xfer += $output->writeFieldBegin('fieldList', TType::LST, 1);
             $output->writeListBegin(TType::STRING, count($this->fieldList));
-            foreach ($this->fieldList as $iter1077) {
-                $xfer += $output->writeString($iter1077);
+            foreach ($this->fieldList as $iter881) {
+                $xfer += $output->writeString($iter881);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTableRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTableRequest.php
index 86d3067..4100aa2 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTableRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTableRequest.php
@@ -220,13 +220,13 @@
                 case 8:
                     if ($ftype == TType::LST) {
                         $this->processorCapabilities = array();
-                        $_size875 = 0;
-                        $_etype878 = 0;
-                        $xfer += $input->readListBegin($_etype878, $_size875);
-                        for ($_i879 = 0; $_i879 < $_size875; ++$_i879) {
-                            $elem880 = null;
-                            $xfer += $input->readString($elem880);
-                            $this->processorCapabilities []= $elem880;
+                        $_size882 = 0;
+                        $_etype885 = 0;
+                        $xfer += $input->readListBegin($_etype885, $_size882);
+                        for ($_i886 = 0; $_i886 < $_size882; ++$_i886) {
+                            $elem887 = null;
+                            $xfer += $input->readString($elem887);
+                            $this->processorCapabilities []= $elem887;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -307,8 +307,8 @@
             }
             $xfer += $output->writeFieldBegin('processorCapabilities', TType::LST, 8);
             $output->writeListBegin(TType::STRING, count($this->processorCapabilities));
-            foreach ($this->processorCapabilities as $iter881) {
-                $xfer += $output->writeString($iter881);
+            foreach ($this->processorCapabilities as $iter888) {
+                $xfer += $output->writeString($iter888);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTablesExtRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTablesExtRequest.php
index b98b3c9..6d25da9 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTablesExtRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTablesExtRequest.php
@@ -175,13 +175,13 @@
                 case 6:
                     if ($ftype == TType::LST) {
                         $this->processorCapabilities = array();
-                        $_size903 = 0;
-                        $_etype906 = 0;
-                        $xfer += $input->readListBegin($_etype906, $_size903);
-                        for ($_i907 = 0; $_i907 < $_size903; ++$_i907) {
-                            $elem908 = null;
-                            $xfer += $input->readString($elem908);
-                            $this->processorCapabilities []= $elem908;
+                        $_size910 = 0;
+                        $_etype913 = 0;
+                        $xfer += $input->readListBegin($_etype913, $_size910);
+                        for ($_i914 = 0; $_i914 < $_size910; ++$_i914) {
+                            $elem915 = null;
+                            $xfer += $input->readString($elem915);
+                            $this->processorCapabilities []= $elem915;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -240,8 +240,8 @@
             }
             $xfer += $output->writeFieldBegin('processorCapabilities', TType::LST, 6);
             $output->writeListBegin(TType::STRING, count($this->processorCapabilities));
-            foreach ($this->processorCapabilities as $iter909) {
-                $xfer += $output->writeString($iter909);
+            foreach ($this->processorCapabilities as $iter916) {
+                $xfer += $output->writeString($iter916);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTablesRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTablesRequest.php
index 1e84a65..eb480cf 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTablesRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTablesRequest.php
@@ -153,13 +153,13 @@
                 case 2:
                     if ($ftype == TType::LST) {
                         $this->tblNames = array();
-                        $_size882 = 0;
-                        $_etype885 = 0;
-                        $xfer += $input->readListBegin($_etype885, $_size882);
-                        for ($_i886 = 0; $_i886 < $_size882; ++$_i886) {
-                            $elem887 = null;
-                            $xfer += $input->readString($elem887);
-                            $this->tblNames []= $elem887;
+                        $_size889 = 0;
+                        $_etype892 = 0;
+                        $xfer += $input->readListBegin($_etype892, $_size889);
+                        for ($_i893 = 0; $_i893 < $_size889; ++$_i893) {
+                            $elem894 = null;
+                            $xfer += $input->readString($elem894);
+                            $this->tblNames []= $elem894;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -184,13 +184,13 @@
                 case 5:
                     if ($ftype == TType::LST) {
                         $this->processorCapabilities = array();
-                        $_size888 = 0;
-                        $_etype891 = 0;
-                        $xfer += $input->readListBegin($_etype891, $_size888);
-                        for ($_i892 = 0; $_i892 < $_size888; ++$_i892) {
-                            $elem893 = null;
-                            $xfer += $input->readString($elem893);
-                            $this->processorCapabilities []= $elem893;
+                        $_size895 = 0;
+                        $_etype898 = 0;
+                        $xfer += $input->readListBegin($_etype898, $_size895);
+                        for ($_i899 = 0; $_i899 < $_size895; ++$_i899) {
+                            $elem900 = null;
+                            $xfer += $input->readString($elem900);
+                            $this->processorCapabilities []= $elem900;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -237,8 +237,8 @@
             }
             $xfer += $output->writeFieldBegin('tblNames', TType::LST, 2);
             $output->writeListBegin(TType::STRING, count($this->tblNames));
-            foreach ($this->tblNames as $iter894) {
-                $xfer += $output->writeString($iter894);
+            foreach ($this->tblNames as $iter901) {
+                $xfer += $output->writeString($iter901);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
@@ -262,8 +262,8 @@
             }
             $xfer += $output->writeFieldBegin('processorCapabilities', TType::LST, 5);
             $output->writeListBegin(TType::STRING, count($this->processorCapabilities));
-            foreach ($this->processorCapabilities as $iter895) {
-                $xfer += $output->writeString($iter895);
+            foreach ($this->processorCapabilities as $iter902) {
+                $xfer += $output->writeString($iter902);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTablesResult.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTablesResult.php
index c58c561..67cd0d5 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTablesResult.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/GetTablesResult.php
@@ -69,14 +69,14 @@
                 case 1:
                     if ($ftype == TType::LST) {
                         $this->tables = array();
-                        $_size896 = 0;
-                        $_etype899 = 0;
-                        $xfer += $input->readListBegin($_etype899, $_size896);
-                        for ($_i900 = 0; $_i900 < $_size896; ++$_i900) {
-                            $elem901 = null;
-                            $elem901 = new \metastore\Table();
-                            $xfer += $elem901->read($input);
-                            $this->tables []= $elem901;
+                        $_size903 = 0;
+                        $_etype906 = 0;
+                        $xfer += $input->readListBegin($_etype906, $_size903);
+                        for ($_i907 = 0; $_i907 < $_size903; ++$_i907) {
+                            $elem908 = null;
+                            $elem908 = new \metastore\Table();
+                            $xfer += $elem908->read($input);
+                            $this->tables []= $elem908;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -103,8 +103,8 @@
             }
             $xfer += $output->writeFieldBegin('tables', TType::LST, 1);
             $output->writeListBegin(TType::STRUCT, count($this->tables));
-            foreach ($this->tables as $iter902) {
-                $xfer += $iter902->write($output);
+            foreach ($this->tables as $iter909) {
+                $xfer += $iter909->write($output);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/RenamePartitionRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/RenamePartitionRequest.php
index 221b5c4..9a058f7 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/RenamePartitionRequest.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/RenamePartitionRequest.php
@@ -150,13 +150,13 @@
                 case 4:
                     if ($ftype == TType::LST) {
                         $this->partVals = array();
-                        $_size1057 = 0;
-                        $_etype1060 = 0;
-                        $xfer += $input->readListBegin($_etype1060, $_size1057);
-                        for ($_i1061 = 0; $_i1061 < $_size1057; ++$_i1061) {
-                            $elem1062 = null;
-                            $xfer += $input->readString($elem1062);
-                            $this->partVals []= $elem1062;
+                        $_size1064 = 0;
+                        $_etype1067 = 0;
+                        $xfer += $input->readListBegin($_etype1067, $_size1064);
+                        for ($_i1068 = 0; $_i1068 < $_size1064; ++$_i1068) {
+                            $elem1069 = null;
+                            $xfer += $input->readString($elem1069);
+                            $this->partVals []= $elem1069;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -213,8 +213,8 @@
             }
             $xfer += $output->writeFieldBegin('partVals', TType::LST, 4);
             $output->writeListBegin(TType::STRING, count($this->partVals));
-            foreach ($this->partVals as $iter1063) {
-                $xfer += $output->writeString($iter1063);
+            foreach ($this->partVals as $iter1070) {
+                $xfer += $output->writeString($iter1070);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SchemaVersion.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SchemaVersion.php
index 46119a2..b70ab7f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SchemaVersion.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/SchemaVersion.php
@@ -201,14 +201,14 @@
                 case 4:
                     if ($ftype == TType::LST) {
                         $this->cols = array();
-                        $_size987 = 0;
-                        $_etype990 = 0;
-                        $xfer += $input->readListBegin($_etype990, $_size987);
-                        for ($_i991 = 0; $_i991 < $_size987; ++$_i991) {
-                            $elem992 = null;
-                            $elem992 = new \metastore\FieldSchema();
-                            $xfer += $elem992->read($input);
-                            $this->cols []= $elem992;
+                        $_size994 = 0;
+                        $_etype997 = 0;
+                        $xfer += $input->readListBegin($_etype997, $_size994);
+                        for ($_i998 = 0; $_i998 < $_size994; ++$_i998) {
+                            $elem999 = null;
+                            $elem999 = new \metastore\FieldSchema();
+                            $xfer += $elem999->read($input);
+                            $this->cols []= $elem999;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -296,8 +296,8 @@
             }
             $xfer += $output->writeFieldBegin('cols', TType::LST, 4);
             $output->writeListBegin(TType::STRUCT, count($this->cols));
-            foreach ($this->cols as $iter993) {
-                $xfer += $iter993->write($output);
+            foreach ($this->cols as $iter1000) {
+                $xfer += $iter1000->write($output);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMFullResourcePlan.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMFullResourcePlan.php
index 5e211d9..7ba0596 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMFullResourcePlan.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMFullResourcePlan.php
@@ -141,14 +141,14 @@
                 case 2:
                     if ($ftype == TType::LST) {
                         $this->pools = array();
-                        $_size931 = 0;
-                        $_etype934 = 0;
-                        $xfer += $input->readListBegin($_etype934, $_size931);
-                        for ($_i935 = 0; $_i935 < $_size931; ++$_i935) {
-                            $elem936 = null;
-                            $elem936 = new \metastore\WMPool();
-                            $xfer += $elem936->read($input);
-                            $this->pools []= $elem936;
+                        $_size938 = 0;
+                        $_etype941 = 0;
+                        $xfer += $input->readListBegin($_etype941, $_size938);
+                        for ($_i942 = 0; $_i942 < $_size938; ++$_i942) {
+                            $elem943 = null;
+                            $elem943 = new \metastore\WMPool();
+                            $xfer += $elem943->read($input);
+                            $this->pools []= $elem943;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -158,14 +158,14 @@
                 case 3:
                     if ($ftype == TType::LST) {
                         $this->mappings = array();
-                        $_size937 = 0;
-                        $_etype940 = 0;
-                        $xfer += $input->readListBegin($_etype940, $_size937);
-                        for ($_i941 = 0; $_i941 < $_size937; ++$_i941) {
-                            $elem942 = null;
-                            $elem942 = new \metastore\WMMapping();
-                            $xfer += $elem942->read($input);
-                            $this->mappings []= $elem942;
+                        $_size944 = 0;
+                        $_etype947 = 0;
+                        $xfer += $input->readListBegin($_etype947, $_size944);
+                        for ($_i948 = 0; $_i948 < $_size944; ++$_i948) {
+                            $elem949 = null;
+                            $elem949 = new \metastore\WMMapping();
+                            $xfer += $elem949->read($input);
+                            $this->mappings []= $elem949;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -175,14 +175,14 @@
                 case 4:
                     if ($ftype == TType::LST) {
                         $this->triggers = array();
-                        $_size943 = 0;
-                        $_etype946 = 0;
-                        $xfer += $input->readListBegin($_etype946, $_size943);
-                        for ($_i947 = 0; $_i947 < $_size943; ++$_i947) {
-                            $elem948 = null;
-                            $elem948 = new \metastore\WMTrigger();
-                            $xfer += $elem948->read($input);
-                            $this->triggers []= $elem948;
+                        $_size950 = 0;
+                        $_etype953 = 0;
+                        $xfer += $input->readListBegin($_etype953, $_size950);
+                        for ($_i954 = 0; $_i954 < $_size950; ++$_i954) {
+                            $elem955 = null;
+                            $elem955 = new \metastore\WMTrigger();
+                            $xfer += $elem955->read($input);
+                            $this->triggers []= $elem955;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -192,14 +192,14 @@
                 case 5:
                     if ($ftype == TType::LST) {
                         $this->poolTriggers = array();
-                        $_size949 = 0;
-                        $_etype952 = 0;
-                        $xfer += $input->readListBegin($_etype952, $_size949);
-                        for ($_i953 = 0; $_i953 < $_size949; ++$_i953) {
-                            $elem954 = null;
-                            $elem954 = new \metastore\WMPoolTrigger();
-                            $xfer += $elem954->read($input);
-                            $this->poolTriggers []= $elem954;
+                        $_size956 = 0;
+                        $_etype959 = 0;
+                        $xfer += $input->readListBegin($_etype959, $_size956);
+                        for ($_i960 = 0; $_i960 < $_size956; ++$_i960) {
+                            $elem961 = null;
+                            $elem961 = new \metastore\WMPoolTrigger();
+                            $xfer += $elem961->read($input);
+                            $this->poolTriggers []= $elem961;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -234,8 +234,8 @@
             }
             $xfer += $output->writeFieldBegin('pools', TType::LST, 2);
             $output->writeListBegin(TType::STRUCT, count($this->pools));
-            foreach ($this->pools as $iter955) {
-                $xfer += $iter955->write($output);
+            foreach ($this->pools as $iter962) {
+                $xfer += $iter962->write($output);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
@@ -246,8 +246,8 @@
             }
             $xfer += $output->writeFieldBegin('mappings', TType::LST, 3);
             $output->writeListBegin(TType::STRUCT, count($this->mappings));
-            foreach ($this->mappings as $iter956) {
-                $xfer += $iter956->write($output);
+            foreach ($this->mappings as $iter963) {
+                $xfer += $iter963->write($output);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
@@ -258,8 +258,8 @@
             }
             $xfer += $output->writeFieldBegin('triggers', TType::LST, 4);
             $output->writeListBegin(TType::STRUCT, count($this->triggers));
-            foreach ($this->triggers as $iter957) {
-                $xfer += $iter957->write($output);
+            foreach ($this->triggers as $iter964) {
+                $xfer += $iter964->write($output);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
@@ -270,8 +270,8 @@
             }
             $xfer += $output->writeFieldBegin('poolTriggers', TType::LST, 5);
             $output->writeListBegin(TType::STRUCT, count($this->poolTriggers));
-            foreach ($this->poolTriggers as $iter958) {
-                $xfer += $iter958->write($output);
+            foreach ($this->poolTriggers as $iter965) {
+                $xfer += $iter965->write($output);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetAllResourcePlanResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetAllResourcePlanResponse.php
index 47e91c3..083f67f 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetAllResourcePlanResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetAllResourcePlanResponse.php
@@ -69,14 +69,14 @@
                 case 1:
                     if ($ftype == TType::LST) {
                         $this->resourcePlans = array();
-                        $_size959 = 0;
-                        $_etype962 = 0;
-                        $xfer += $input->readListBegin($_etype962, $_size959);
-                        for ($_i963 = 0; $_i963 < $_size959; ++$_i963) {
-                            $elem964 = null;
-                            $elem964 = new \metastore\WMResourcePlan();
-                            $xfer += $elem964->read($input);
-                            $this->resourcePlans []= $elem964;
+                        $_size966 = 0;
+                        $_etype969 = 0;
+                        $xfer += $input->readListBegin($_etype969, $_size966);
+                        for ($_i970 = 0; $_i970 < $_size966; ++$_i970) {
+                            $elem971 = null;
+                            $elem971 = new \metastore\WMResourcePlan();
+                            $xfer += $elem971->read($input);
+                            $this->resourcePlans []= $elem971;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -103,8 +103,8 @@
             }
             $xfer += $output->writeFieldBegin('resourcePlans', TType::LST, 1);
             $output->writeListBegin(TType::STRUCT, count($this->resourcePlans));
-            foreach ($this->resourcePlans as $iter965) {
-                $xfer += $iter965->write($output);
+            foreach ($this->resourcePlans as $iter972) {
+                $xfer += $iter972->write($output);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetTriggersForResourePlanResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetTriggersForResourePlanResponse.php
index 402faf5..dc79da3 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetTriggersForResourePlanResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMGetTriggersForResourePlanResponse.php
@@ -69,14 +69,14 @@
                 case 1:
                     if ($ftype == TType::LST) {
                         $this->triggers = array();
-                        $_size980 = 0;
-                        $_etype983 = 0;
-                        $xfer += $input->readListBegin($_etype983, $_size980);
-                        for ($_i984 = 0; $_i984 < $_size980; ++$_i984) {
-                            $elem985 = null;
-                            $elem985 = new \metastore\WMTrigger();
-                            $xfer += $elem985->read($input);
-                            $this->triggers []= $elem985;
+                        $_size987 = 0;
+                        $_etype990 = 0;
+                        $xfer += $input->readListBegin($_etype990, $_size987);
+                        for ($_i991 = 0; $_i991 < $_size987; ++$_i991) {
+                            $elem992 = null;
+                            $elem992 = new \metastore\WMTrigger();
+                            $xfer += $elem992->read($input);
+                            $this->triggers []= $elem992;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -103,8 +103,8 @@
             }
             $xfer += $output->writeFieldBegin('triggers', TType::LST, 1);
             $output->writeListBegin(TType::STRUCT, count($this->triggers));
-            foreach ($this->triggers as $iter986) {
-                $xfer += $iter986->write($output);
+            foreach ($this->triggers as $iter993) {
+                $xfer += $iter993->write($output);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMValidateResourcePlanResponse.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMValidateResourcePlanResponse.php
index 07c2729..3fa7085 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMValidateResourcePlanResponse.php
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/WMValidateResourcePlanResponse.php
@@ -84,13 +84,13 @@
                 case 1:
                     if ($ftype == TType::LST) {
                         $this->errors = array();
-                        $_size966 = 0;
-                        $_etype969 = 0;
-                        $xfer += $input->readListBegin($_etype969, $_size966);
-                        for ($_i970 = 0; $_i970 < $_size966; ++$_i970) {
-                            $elem971 = null;
-                            $xfer += $input->readString($elem971);
-                            $this->errors []= $elem971;
+                        $_size973 = 0;
+                        $_etype976 = 0;
+                        $xfer += $input->readListBegin($_etype976, $_size973);
+                        for ($_i977 = 0; $_i977 < $_size973; ++$_i977) {
+                            $elem978 = null;
+                            $xfer += $input->readString($elem978);
+                            $this->errors []= $elem978;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -100,13 +100,13 @@
                 case 2:
                     if ($ftype == TType::LST) {
                         $this->warnings = array();
-                        $_size972 = 0;
-                        $_etype975 = 0;
-                        $xfer += $input->readListBegin($_etype975, $_size972);
-                        for ($_i976 = 0; $_i976 < $_size972; ++$_i976) {
-                            $elem977 = null;
-                            $xfer += $input->readString($elem977);
-                            $this->warnings []= $elem977;
+                        $_size979 = 0;
+                        $_etype982 = 0;
+                        $xfer += $input->readListBegin($_etype982, $_size979);
+                        for ($_i983 = 0; $_i983 < $_size979; ++$_i983) {
+                            $elem984 = null;
+                            $xfer += $input->readString($elem984);
+                            $this->warnings []= $elem984;
                         }
                         $xfer += $input->readListEnd();
                     } else {
@@ -133,8 +133,8 @@
             }
             $xfer += $output->writeFieldBegin('errors', TType::LST, 1);
             $output->writeListBegin(TType::STRING, count($this->errors));
-            foreach ($this->errors as $iter978) {
-                $xfer += $output->writeString($iter978);
+            foreach ($this->errors as $iter985) {
+                $xfer += $output->writeString($iter985);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
@@ -145,8 +145,8 @@
             }
             $xfer += $output->writeFieldBegin('warnings', TType::LST, 2);
             $output->writeListBegin(TType::STRING, count($this->warnings));
-            foreach ($this->warnings as $iter979) {
-                $xfer += $output->writeString($iter979);
+            foreach ($this->warnings as $iter986) {
+                $xfer += $output->writeString($iter986);
             }
             $output->writeListEnd();
             $xfer += $output->writeFieldEnd();
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ttypes.py b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ttypes.py
index 881d402..ea047f6 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ttypes.py
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ttypes.py
@@ -17451,6 +17451,93 @@
         return not (self == other)
 
 
+class GetProjectionsSpec(object):
+    """
+    Attributes:
+     - fieldList
+     - includeParamKeyPattern
+     - excludeParamKeyPattern
+
+    """
+
+
+    def __init__(self, fieldList=None, includeParamKeyPattern=None, excludeParamKeyPattern=None,):
+        self.fieldList = fieldList
+        self.includeParamKeyPattern = includeParamKeyPattern
+        self.excludeParamKeyPattern = excludeParamKeyPattern
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 1:
+                if ftype == TType.LIST:
+                    self.fieldList = []
+                    (_etype875, _size872) = iprot.readListBegin()
+                    for _i876 in range(_size872):
+                        _elem877 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                        self.fieldList.append(_elem877)
+                    iprot.readListEnd()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 2:
+                if ftype == TType.STRING:
+                    self.includeParamKeyPattern = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 3:
+                if ftype == TType.STRING:
+                    self.excludeParamKeyPattern = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('GetProjectionsSpec')
+        if self.fieldList is not None:
+            oprot.writeFieldBegin('fieldList', TType.LIST, 1)
+            oprot.writeListBegin(TType.STRING, len(self.fieldList))
+            for iter878 in self.fieldList:
+                oprot.writeString(iter878.encode('utf-8') if sys.version_info[0] == 2 else iter878)
+            oprot.writeListEnd()
+            oprot.writeFieldEnd()
+        if self.includeParamKeyPattern is not None:
+            oprot.writeFieldBegin('includeParamKeyPattern', TType.STRING, 2)
+            oprot.writeString(self.includeParamKeyPattern.encode('utf-8') if sys.version_info[0] == 2 else self.includeParamKeyPattern)
+            oprot.writeFieldEnd()
+        if self.excludeParamKeyPattern is not None:
+            oprot.writeFieldBegin('excludeParamKeyPattern', TType.STRING, 3)
+            oprot.writeString(self.excludeParamKeyPattern.encode('utf-8') if sys.version_info[0] == 2 else self.excludeParamKeyPattern)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+
+
 class GetTableRequest(object):
     """
     Attributes:
@@ -17523,10 +17610,10 @@
             elif fid == 8:
                 if ftype == TType.LIST:
                     self.processorCapabilities = []
-                    (_etype875, _size872) = iprot.readListBegin()
-                    for _i876 in range(_size872):
-                        _elem877 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                        self.processorCapabilities.append(_elem877)
+                    (_etype882, _size879) = iprot.readListBegin()
+                    for _i883 in range(_size879):
+                        _elem884 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                        self.processorCapabilities.append(_elem884)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
@@ -17582,8 +17669,8 @@
         if self.processorCapabilities is not None:
             oprot.writeFieldBegin('processorCapabilities', TType.LIST, 8)
             oprot.writeListBegin(TType.STRING, len(self.processorCapabilities))
-            for iter878 in self.processorCapabilities:
-                oprot.writeString(iter878.encode('utf-8') if sys.version_info[0] == 2 else iter878)
+            for iter885 in self.processorCapabilities:
+                oprot.writeString(iter885.encode('utf-8') if sys.version_info[0] == 2 else iter885)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.processorIdentifier is not None:
@@ -17731,10 +17818,10 @@
             elif fid == 2:
                 if ftype == TType.LIST:
                     self.tblNames = []
-                    (_etype882, _size879) = iprot.readListBegin()
-                    for _i883 in range(_size879):
-                        _elem884 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                        self.tblNames.append(_elem884)
+                    (_etype889, _size886) = iprot.readListBegin()
+                    for _i890 in range(_size886):
+                        _elem891 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                        self.tblNames.append(_elem891)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
@@ -17752,10 +17839,10 @@
             elif fid == 5:
                 if ftype == TType.LIST:
                     self.processorCapabilities = []
-                    (_etype888, _size885) = iprot.readListBegin()
-                    for _i889 in range(_size885):
-                        _elem890 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                        self.processorCapabilities.append(_elem890)
+                    (_etype895, _size892) = iprot.readListBegin()
+                    for _i896 in range(_size892):
+                        _elem897 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                        self.processorCapabilities.append(_elem897)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
@@ -17787,8 +17874,8 @@
         if self.tblNames is not None:
             oprot.writeFieldBegin('tblNames', TType.LIST, 2)
             oprot.writeListBegin(TType.STRING, len(self.tblNames))
-            for iter891 in self.tblNames:
-                oprot.writeString(iter891.encode('utf-8') if sys.version_info[0] == 2 else iter891)
+            for iter898 in self.tblNames:
+                oprot.writeString(iter898.encode('utf-8') if sys.version_info[0] == 2 else iter898)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.capabilities is not None:
@@ -17802,8 +17889,8 @@
         if self.processorCapabilities is not None:
             oprot.writeFieldBegin('processorCapabilities', TType.LIST, 5)
             oprot.writeListBegin(TType.STRING, len(self.processorCapabilities))
-            for iter892 in self.processorCapabilities:
-                oprot.writeString(iter892.encode('utf-8') if sys.version_info[0] == 2 else iter892)
+            for iter899 in self.processorCapabilities:
+                oprot.writeString(iter899.encode('utf-8') if sys.version_info[0] == 2 else iter899)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.processorIdentifier is not None:
@@ -17857,11 +17944,11 @@
             if fid == 1:
                 if ftype == TType.LIST:
                     self.tables = []
-                    (_etype896, _size893) = iprot.readListBegin()
-                    for _i897 in range(_size893):
-                        _elem898 = Table()
-                        _elem898.read(iprot)
-                        self.tables.append(_elem898)
+                    (_etype903, _size900) = iprot.readListBegin()
+                    for _i904 in range(_size900):
+                        _elem905 = Table()
+                        _elem905.read(iprot)
+                        self.tables.append(_elem905)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
@@ -17878,8 +17965,8 @@
         if self.tables is not None:
             oprot.writeFieldBegin('tables', TType.LIST, 1)
             oprot.writeListBegin(TType.STRUCT, len(self.tables))
-            for iter899 in self.tables:
-                iter899.write(oprot)
+            for iter906 in self.tables:
+                iter906.write(oprot)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
@@ -17962,10 +18049,10 @@
             elif fid == 6:
                 if ftype == TType.LIST:
                     self.processorCapabilities = []
-                    (_etype903, _size900) = iprot.readListBegin()
-                    for _i904 in range(_size900):
-                        _elem905 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                        self.processorCapabilities.append(_elem905)
+                    (_etype910, _size907) = iprot.readListBegin()
+                    for _i911 in range(_size907):
+                        _elem912 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                        self.processorCapabilities.append(_elem912)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
@@ -18007,8 +18094,8 @@
         if self.processorCapabilities is not None:
             oprot.writeFieldBegin('processorCapabilities', TType.LIST, 6)
             oprot.writeListBegin(TType.STRING, len(self.processorCapabilities))
-            for iter906 in self.processorCapabilities:
-                oprot.writeString(iter906.encode('utf-8') if sys.version_info[0] == 2 else iter906)
+            for iter913 in self.processorCapabilities:
+                oprot.writeString(iter913.encode('utf-8') if sys.version_info[0] == 2 else iter913)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.processorIdentifier is not None:
@@ -18080,20 +18167,20 @@
             elif fid == 3:
                 if ftype == TType.LIST:
                     self.requiredReadCapabilities = []
-                    (_etype910, _size907) = iprot.readListBegin()
-                    for _i911 in range(_size907):
-                        _elem912 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                        self.requiredReadCapabilities.append(_elem912)
+                    (_etype917, _size914) = iprot.readListBegin()
+                    for _i918 in range(_size914):
+                        _elem919 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                        self.requiredReadCapabilities.append(_elem919)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.LIST:
                     self.requiredWriteCapabilities = []
-                    (_etype916, _size913) = iprot.readListBegin()
-                    for _i917 in range(_size913):
-                        _elem918 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                        self.requiredWriteCapabilities.append(_elem918)
+                    (_etype923, _size920) = iprot.readListBegin()
+                    for _i924 in range(_size920):
+                        _elem925 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                        self.requiredWriteCapabilities.append(_elem925)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
@@ -18118,15 +18205,15 @@
         if self.requiredReadCapabilities is not None:
             oprot.writeFieldBegin('requiredReadCapabilities', TType.LIST, 3)
             oprot.writeListBegin(TType.STRING, len(self.requiredReadCapabilities))
-            for iter919 in self.requiredReadCapabilities:
-                oprot.writeString(iter919.encode('utf-8') if sys.version_info[0] == 2 else iter919)
+            for iter926 in self.requiredReadCapabilities:
+                oprot.writeString(iter926.encode('utf-8') if sys.version_info[0] == 2 else iter926)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.requiredWriteCapabilities is not None:
             oprot.writeFieldBegin('requiredWriteCapabilities', TType.LIST, 4)
             oprot.writeListBegin(TType.STRING, len(self.requiredWriteCapabilities))
-            for iter920 in self.requiredWriteCapabilities:
-                oprot.writeString(iter920.encode('utf-8') if sys.version_info[0] == 2 else iter920)
+            for iter927 in self.requiredWriteCapabilities:
+                oprot.writeString(iter927.encode('utf-8') if sys.version_info[0] == 2 else iter927)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
@@ -18188,10 +18275,10 @@
             elif fid == 3:
                 if ftype == TType.LIST:
                     self.processorCapabilities = []
-                    (_etype924, _size921) = iprot.readListBegin()
-                    for _i925 in range(_size921):
-                        _elem926 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                        self.processorCapabilities.append(_elem926)
+                    (_etype931, _size928) = iprot.readListBegin()
+                    for _i932 in range(_size928):
+                        _elem933 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                        self.processorCapabilities.append(_elem933)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
@@ -18221,8 +18308,8 @@
         if self.processorCapabilities is not None:
             oprot.writeFieldBegin('processorCapabilities', TType.LIST, 3)
             oprot.writeListBegin(TType.STRING, len(self.processorCapabilities))
-            for iter927 in self.processorCapabilities:
-                oprot.writeString(iter927.encode('utf-8') if sys.version_info[0] == 2 else iter927)
+            for iter934 in self.processorCapabilities:
+                oprot.writeString(iter934.encode('utf-8') if sys.version_info[0] == 2 else iter934)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.processorIdentifier is not None:
@@ -19348,44 +19435,44 @@
             elif fid == 2:
                 if ftype == TType.LIST:
                     self.pools = []
-                    (_etype931, _size928) = iprot.readListBegin()
-                    for _i932 in range(_size928):
-                        _elem933 = WMPool()
-                        _elem933.read(iprot)
-                        self.pools.append(_elem933)
+                    (_etype938, _size935) = iprot.readListBegin()
+                    for _i939 in range(_size935):
+                        _elem940 = WMPool()
+                        _elem940.read(iprot)
+                        self.pools.append(_elem940)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.LIST:
                     self.mappings = []
-                    (_etype937, _size934) = iprot.readListBegin()
-                    for _i938 in range(_size934):
-                        _elem939 = WMMapping()
-                        _elem939.read(iprot)
-                        self.mappings.append(_elem939)
+                    (_etype944, _size941) = iprot.readListBegin()
+                    for _i945 in range(_size941):
+                        _elem946 = WMMapping()
+                        _elem946.read(iprot)
+                        self.mappings.append(_elem946)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.LIST:
                     self.triggers = []
-                    (_etype943, _size940) = iprot.readListBegin()
-                    for _i944 in range(_size940):
-                        _elem945 = WMTrigger()
-                        _elem945.read(iprot)
-                        self.triggers.append(_elem945)
+                    (_etype950, _size947) = iprot.readListBegin()
+                    for _i951 in range(_size947):
+                        _elem952 = WMTrigger()
+                        _elem952.read(iprot)
+                        self.triggers.append(_elem952)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
             elif fid == 5:
                 if ftype == TType.LIST:
                     self.poolTriggers = []
-                    (_etype949, _size946) = iprot.readListBegin()
-                    for _i950 in range(_size946):
-                        _elem951 = WMPoolTrigger()
-                        _elem951.read(iprot)
-                        self.poolTriggers.append(_elem951)
+                    (_etype956, _size953) = iprot.readListBegin()
+                    for _i957 in range(_size953):
+                        _elem958 = WMPoolTrigger()
+                        _elem958.read(iprot)
+                        self.poolTriggers.append(_elem958)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
@@ -19406,29 +19493,29 @@
         if self.pools is not None:
             oprot.writeFieldBegin('pools', TType.LIST, 2)
             oprot.writeListBegin(TType.STRUCT, len(self.pools))
-            for iter952 in self.pools:
-                iter952.write(oprot)
+            for iter959 in self.pools:
+                iter959.write(oprot)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.mappings is not None:
             oprot.writeFieldBegin('mappings', TType.LIST, 3)
             oprot.writeListBegin(TType.STRUCT, len(self.mappings))
-            for iter953 in self.mappings:
-                iter953.write(oprot)
+            for iter960 in self.mappings:
+                iter960.write(oprot)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.triggers is not None:
             oprot.writeFieldBegin('triggers', TType.LIST, 4)
             oprot.writeListBegin(TType.STRUCT, len(self.triggers))
-            for iter954 in self.triggers:
-                iter954.write(oprot)
+            for iter961 in self.triggers:
+                iter961.write(oprot)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.poolTriggers is not None:
             oprot.writeFieldBegin('poolTriggers', TType.LIST, 5)
             oprot.writeListBegin(TType.STRUCT, len(self.poolTriggers))
-            for iter955 in self.poolTriggers:
-                iter955.write(oprot)
+            for iter962 in self.poolTriggers:
+                iter962.write(oprot)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
@@ -19883,11 +19970,11 @@
             if fid == 1:
                 if ftype == TType.LIST:
                     self.resourcePlans = []
-                    (_etype959, _size956) = iprot.readListBegin()
-                    for _i960 in range(_size956):
-                        _elem961 = WMResourcePlan()
-                        _elem961.read(iprot)
-                        self.resourcePlans.append(_elem961)
+                    (_etype966, _size963) = iprot.readListBegin()
+                    for _i967 in range(_size963):
+                        _elem968 = WMResourcePlan()
+                        _elem968.read(iprot)
+                        self.resourcePlans.append(_elem968)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
@@ -19904,8 +19991,8 @@
         if self.resourcePlans is not None:
             oprot.writeFieldBegin('resourcePlans', TType.LIST, 1)
             oprot.writeListBegin(TType.STRUCT, len(self.resourcePlans))
-            for iter962 in self.resourcePlans:
-                iter962.write(oprot)
+            for iter969 in self.resourcePlans:
+                iter969.write(oprot)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
@@ -20190,20 +20277,20 @@
             if fid == 1:
                 if ftype == TType.LIST:
                     self.errors = []
-                    (_etype966, _size963) = iprot.readListBegin()
-                    for _i967 in range(_size963):
-                        _elem968 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                        self.errors.append(_elem968)
+                    (_etype973, _size970) = iprot.readListBegin()
+                    for _i974 in range(_size970):
+                        _elem975 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                        self.errors.append(_elem975)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.LIST:
                     self.warnings = []
-                    (_etype972, _size969) = iprot.readListBegin()
-                    for _i973 in range(_size969):
-                        _elem974 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                        self.warnings.append(_elem974)
+                    (_etype979, _size976) = iprot.readListBegin()
+                    for _i980 in range(_size976):
+                        _elem981 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                        self.warnings.append(_elem981)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
@@ -20220,15 +20307,15 @@
         if self.errors is not None:
             oprot.writeFieldBegin('errors', TType.LIST, 1)
             oprot.writeListBegin(TType.STRING, len(self.errors))
-            for iter975 in self.errors:
-                oprot.writeString(iter975.encode('utf-8') if sys.version_info[0] == 2 else iter975)
+            for iter982 in self.errors:
+                oprot.writeString(iter982.encode('utf-8') if sys.version_info[0] == 2 else iter982)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.warnings is not None:
             oprot.writeFieldBegin('warnings', TType.LIST, 2)
             oprot.writeListBegin(TType.STRING, len(self.warnings))
-            for iter976 in self.warnings:
-                oprot.writeString(iter976.encode('utf-8') if sys.version_info[0] == 2 else iter976)
+            for iter983 in self.warnings:
+                oprot.writeString(iter983.encode('utf-8') if sys.version_info[0] == 2 else iter983)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
@@ -20763,11 +20850,11 @@
             if fid == 1:
                 if ftype == TType.LIST:
                     self.triggers = []
-                    (_etype980, _size977) = iprot.readListBegin()
-                    for _i981 in range(_size977):
-                        _elem982 = WMTrigger()
-                        _elem982.read(iprot)
-                        self.triggers.append(_elem982)
+                    (_etype987, _size984) = iprot.readListBegin()
+                    for _i988 in range(_size984):
+                        _elem989 = WMTrigger()
+                        _elem989.read(iprot)
+                        self.triggers.append(_elem989)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
@@ -20784,8 +20871,8 @@
         if self.triggers is not None:
             oprot.writeFieldBegin('triggers', TType.LIST, 1)
             oprot.writeListBegin(TType.STRUCT, len(self.triggers))
-            for iter983 in self.triggers:
-                iter983.write(oprot)
+            for iter990 in self.triggers:
+                iter990.write(oprot)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
@@ -21831,11 +21918,11 @@
             elif fid == 4:
                 if ftype == TType.LIST:
                     self.cols = []
-                    (_etype987, _size984) = iprot.readListBegin()
-                    for _i988 in range(_size984):
-                        _elem989 = FieldSchema()
-                        _elem989.read(iprot)
-                        self.cols.append(_elem989)
+                    (_etype994, _size991) = iprot.readListBegin()
+                    for _i995 in range(_size991):
+                        _elem996 = FieldSchema()
+                        _elem996.read(iprot)
+                        self.cols.append(_elem996)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
@@ -21895,8 +21982,8 @@
         if self.cols is not None:
             oprot.writeFieldBegin('cols', TType.LIST, 4)
             oprot.writeListBegin(TType.STRUCT, len(self.cols))
-            for iter990 in self.cols:
-                iter990.write(oprot)
+            for iter997 in self.cols:
+                iter997.write(oprot)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.state is not None:
@@ -22112,11 +22199,11 @@
             if fid == 1:
                 if ftype == TType.LIST:
                     self.schemaVersions = []
-                    (_etype994, _size991) = iprot.readListBegin()
-                    for _i995 in range(_size991):
-                        _elem996 = SchemaVersionDescriptor()
-                        _elem996.read(iprot)
-                        self.schemaVersions.append(_elem996)
+                    (_etype1001, _size998) = iprot.readListBegin()
+                    for _i1002 in range(_size998):
+                        _elem1003 = SchemaVersionDescriptor()
+                        _elem1003.read(iprot)
+                        self.schemaVersions.append(_elem1003)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
@@ -22133,8 +22220,8 @@
         if self.schemaVersions is not None:
             oprot.writeFieldBegin('schemaVersions', TType.LIST, 1)
             oprot.writeListBegin(TType.STRUCT, len(self.schemaVersions))
-            for iter997 in self.schemaVersions:
-                iter997.write(oprot)
+            for iter1004 in self.schemaVersions:
+                iter1004.write(oprot)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
@@ -22558,76 +22645,76 @@
             elif fid == 3:
                 if ftype == TType.LIST:
                     self.primaryKeys = []
-                    (_etype1001, _size998) = iprot.readListBegin()
-                    for _i1002 in range(_size998):
-                        _elem1003 = SQLPrimaryKey()
-                        _elem1003.read(iprot)
-                        self.primaryKeys.append(_elem1003)
+                    (_etype1008, _size1005) = iprot.readListBegin()
+                    for _i1009 in range(_size1005):
+                        _elem1010 = SQLPrimaryKey()
+                        _elem1010.read(iprot)
+                        self.primaryKeys.append(_elem1010)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.LIST:
                     self.foreignKeys = []
-                    (_etype1007, _size1004) = iprot.readListBegin()
-                    for _i1008 in range(_size1004):
-                        _elem1009 = SQLForeignKey()
-                        _elem1009.read(iprot)
-                        self.foreignKeys.append(_elem1009)
+                    (_etype1014, _size1011) = iprot.readListBegin()
+                    for _i1015 in range(_size1011):
+                        _elem1016 = SQLForeignKey()
+                        _elem1016.read(iprot)
+                        self.foreignKeys.append(_elem1016)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
             elif fid == 5:
                 if ftype == TType.LIST:
                     self.uniqueConstraints = []
-                    (_etype1013, _size1010) = iprot.readListBegin()
-                    for _i1014 in range(_size1010):
-                        _elem1015 = SQLUniqueConstraint()
-                        _elem1015.read(iprot)
-                        self.uniqueConstraints.append(_elem1015)
+                    (_etype1020, _size1017) = iprot.readListBegin()
+                    for _i1021 in range(_size1017):
+                        _elem1022 = SQLUniqueConstraint()
+                        _elem1022.read(iprot)
+                        self.uniqueConstraints.append(_elem1022)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
             elif fid == 6:
                 if ftype == TType.LIST:
                     self.notNullConstraints = []
-                    (_etype1019, _size1016) = iprot.readListBegin()
-                    for _i1020 in range(_size1016):
-                        _elem1021 = SQLNotNullConstraint()
-                        _elem1021.read(iprot)
-                        self.notNullConstraints.append(_elem1021)
+                    (_etype1026, _size1023) = iprot.readListBegin()
+                    for _i1027 in range(_size1023):
+                        _elem1028 = SQLNotNullConstraint()
+                        _elem1028.read(iprot)
+                        self.notNullConstraints.append(_elem1028)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
             elif fid == 7:
                 if ftype == TType.LIST:
                     self.defaultConstraints = []
-                    (_etype1025, _size1022) = iprot.readListBegin()
-                    for _i1026 in range(_size1022):
-                        _elem1027 = SQLDefaultConstraint()
-                        _elem1027.read(iprot)
-                        self.defaultConstraints.append(_elem1027)
+                    (_etype1032, _size1029) = iprot.readListBegin()
+                    for _i1033 in range(_size1029):
+                        _elem1034 = SQLDefaultConstraint()
+                        _elem1034.read(iprot)
+                        self.defaultConstraints.append(_elem1034)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
             elif fid == 8:
                 if ftype == TType.LIST:
                     self.checkConstraints = []
-                    (_etype1031, _size1028) = iprot.readListBegin()
-                    for _i1032 in range(_size1028):
-                        _elem1033 = SQLCheckConstraint()
-                        _elem1033.read(iprot)
-                        self.checkConstraints.append(_elem1033)
+                    (_etype1038, _size1035) = iprot.readListBegin()
+                    for _i1039 in range(_size1035):
+                        _elem1040 = SQLCheckConstraint()
+                        _elem1040.read(iprot)
+                        self.checkConstraints.append(_elem1040)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
             elif fid == 9:
                 if ftype == TType.LIST:
                     self.processorCapabilities = []
-                    (_etype1037, _size1034) = iprot.readListBegin()
-                    for _i1038 in range(_size1034):
-                        _elem1039 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                        self.processorCapabilities.append(_elem1039)
+                    (_etype1044, _size1041) = iprot.readListBegin()
+                    for _i1045 in range(_size1041):
+                        _elem1046 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                        self.processorCapabilities.append(_elem1046)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
@@ -22657,50 +22744,50 @@
         if self.primaryKeys is not None:
             oprot.writeFieldBegin('primaryKeys', TType.LIST, 3)
             oprot.writeListBegin(TType.STRUCT, len(self.primaryKeys))
-            for iter1040 in self.primaryKeys:
-                iter1040.write(oprot)
+            for iter1047 in self.primaryKeys:
+                iter1047.write(oprot)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.foreignKeys is not None:
             oprot.writeFieldBegin('foreignKeys', TType.LIST, 4)
             oprot.writeListBegin(TType.STRUCT, len(self.foreignKeys))
-            for iter1041 in self.foreignKeys:
-                iter1041.write(oprot)
+            for iter1048 in self.foreignKeys:
+                iter1048.write(oprot)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.uniqueConstraints is not None:
             oprot.writeFieldBegin('uniqueConstraints', TType.LIST, 5)
             oprot.writeListBegin(TType.STRUCT, len(self.uniqueConstraints))
-            for iter1042 in self.uniqueConstraints:
-                iter1042.write(oprot)
+            for iter1049 in self.uniqueConstraints:
+                iter1049.write(oprot)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.notNullConstraints is not None:
             oprot.writeFieldBegin('notNullConstraints', TType.LIST, 6)
             oprot.writeListBegin(TType.STRUCT, len(self.notNullConstraints))
-            for iter1043 in self.notNullConstraints:
-                iter1043.write(oprot)
+            for iter1050 in self.notNullConstraints:
+                iter1050.write(oprot)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.defaultConstraints is not None:
             oprot.writeFieldBegin('defaultConstraints', TType.LIST, 7)
             oprot.writeListBegin(TType.STRUCT, len(self.defaultConstraints))
-            for iter1044 in self.defaultConstraints:
-                iter1044.write(oprot)
+            for iter1051 in self.defaultConstraints:
+                iter1051.write(oprot)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.checkConstraints is not None:
             oprot.writeFieldBegin('checkConstraints', TType.LIST, 8)
             oprot.writeListBegin(TType.STRUCT, len(self.checkConstraints))
-            for iter1045 in self.checkConstraints:
-                iter1045.write(oprot)
+            for iter1052 in self.checkConstraints:
+                iter1052.write(oprot)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.processorCapabilities is not None:
             oprot.writeFieldBegin('processorCapabilities', TType.LIST, 9)
             oprot.writeListBegin(TType.STRING, len(self.processorCapabilities))
-            for iter1046 in self.processorCapabilities:
-                oprot.writeString(iter1046.encode('utf-8') if sys.version_info[0] == 2 else iter1046)
+            for iter1053 in self.processorCapabilities:
+                oprot.writeString(iter1053.encode('utf-8') if sys.version_info[0] == 2 else iter1053)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.processorIdentifier is not None:
@@ -23283,11 +23370,11 @@
             elif fid == 4:
                 if ftype == TType.LIST:
                     self.partitions = []
-                    (_etype1050, _size1047) = iprot.readListBegin()
-                    for _i1051 in range(_size1047):
-                        _elem1052 = Partition()
-                        _elem1052.read(iprot)
-                        self.partitions.append(_elem1052)
+                    (_etype1057, _size1054) = iprot.readListBegin()
+                    for _i1058 in range(_size1054):
+                        _elem1059 = Partition()
+                        _elem1059.read(iprot)
+                        self.partitions.append(_elem1059)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
@@ -23332,8 +23419,8 @@
         if self.partitions is not None:
             oprot.writeFieldBegin('partitions', TType.LIST, 4)
             oprot.writeListBegin(TType.STRUCT, len(self.partitions))
-            for iter1053 in self.partitions:
-                iter1053.write(oprot)
+            for iter1060 in self.partitions:
+                iter1060.write(oprot)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.environmentContext is not None:
@@ -23460,10 +23547,10 @@
             elif fid == 4:
                 if ftype == TType.LIST:
                     self.partVals = []
-                    (_etype1057, _size1054) = iprot.readListBegin()
-                    for _i1058 in range(_size1054):
-                        _elem1059 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                        self.partVals.append(_elem1059)
+                    (_etype1064, _size1061) = iprot.readListBegin()
+                    for _i1065 in range(_size1061):
+                        _elem1066 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                        self.partVals.append(_elem1066)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
@@ -23503,8 +23590,8 @@
         if self.partVals is not None:
             oprot.writeFieldBegin('partVals', TType.LIST, 4)
             oprot.writeListBegin(TType.STRING, len(self.partVals))
-            for iter1060 in self.partVals:
-                oprot.writeString(iter1060.encode('utf-8') if sys.version_info[0] == 2 else iter1060)
+            for iter1067 in self.partVals:
+                oprot.writeString(iter1067.encode('utf-8') if sys.version_info[0] == 2 else iter1067)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.newPart is not None:
@@ -23657,10 +23744,10 @@
             elif fid == 8:
                 if ftype == TType.LIST:
                     self.processorCapabilities = []
-                    (_etype1064, _size1061) = iprot.readListBegin()
-                    for _i1065 in range(_size1061):
-                        _elem1066 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                        self.processorCapabilities.append(_elem1066)
+                    (_etype1071, _size1068) = iprot.readListBegin()
+                    for _i1072 in range(_size1068):
+                        _elem1073 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                        self.processorCapabilities.append(_elem1073)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
@@ -23710,8 +23797,8 @@
         if self.processorCapabilities is not None:
             oprot.writeFieldBegin('processorCapabilities', TType.LIST, 8)
             oprot.writeListBegin(TType.STRING, len(self.processorCapabilities))
-            for iter1067 in self.processorCapabilities:
-                oprot.writeString(iter1067.encode('utf-8') if sys.version_info[0] == 2 else iter1067)
+            for iter1074 in self.processorCapabilities:
+                oprot.writeString(iter1074.encode('utf-8') if sys.version_info[0] == 2 else iter1074)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.processorIdentifier is not None:
@@ -23782,93 +23869,6 @@
         return not (self == other)
 
 
-class GetProjectionsSpec(object):
-    """
-    Attributes:
-     - fieldList
-     - includeParamKeyPattern
-     - excludeParamKeyPattern
-
-    """
-
-
-    def __init__(self, fieldList=None, includeParamKeyPattern=None, excludeParamKeyPattern=None,):
-        self.fieldList = fieldList
-        self.includeParamKeyPattern = includeParamKeyPattern
-        self.excludeParamKeyPattern = excludeParamKeyPattern
-
-    def read(self, iprot):
-        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
-            return
-        iprot.readStructBegin()
-        while True:
-            (fname, ftype, fid) = iprot.readFieldBegin()
-            if ftype == TType.STOP:
-                break
-            if fid == 1:
-                if ftype == TType.LIST:
-                    self.fieldList = []
-                    (_etype1071, _size1068) = iprot.readListBegin()
-                    for _i1072 in range(_size1068):
-                        _elem1073 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                        self.fieldList.append(_elem1073)
-                    iprot.readListEnd()
-                else:
-                    iprot.skip(ftype)
-            elif fid == 2:
-                if ftype == TType.STRING:
-                    self.includeParamKeyPattern = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                else:
-                    iprot.skip(ftype)
-            elif fid == 3:
-                if ftype == TType.STRING:
-                    self.excludeParamKeyPattern = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                else:
-                    iprot.skip(ftype)
-            else:
-                iprot.skip(ftype)
-            iprot.readFieldEnd()
-        iprot.readStructEnd()
-
-    def write(self, oprot):
-        if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
-            return
-        oprot.writeStructBegin('GetProjectionsSpec')
-        if self.fieldList is not None:
-            oprot.writeFieldBegin('fieldList', TType.LIST, 1)
-            oprot.writeListBegin(TType.STRING, len(self.fieldList))
-            for iter1074 in self.fieldList:
-                oprot.writeString(iter1074.encode('utf-8') if sys.version_info[0] == 2 else iter1074)
-            oprot.writeListEnd()
-            oprot.writeFieldEnd()
-        if self.includeParamKeyPattern is not None:
-            oprot.writeFieldBegin('includeParamKeyPattern', TType.STRING, 2)
-            oprot.writeString(self.includeParamKeyPattern.encode('utf-8') if sys.version_info[0] == 2 else self.includeParamKeyPattern)
-            oprot.writeFieldEnd()
-        if self.excludeParamKeyPattern is not None:
-            oprot.writeFieldBegin('excludeParamKeyPattern', TType.STRING, 3)
-            oprot.writeString(self.excludeParamKeyPattern.encode('utf-8') if sys.version_info[0] == 2 else self.excludeParamKeyPattern)
-            oprot.writeFieldEnd()
-        oprot.writeFieldStop()
-        oprot.writeStructEnd()
-
-    def validate(self):
-        return
-
-    def __repr__(self):
-        L = ['%s=%r' % (key, value)
-             for key, value in self.__dict__.items()]
-        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-
-    def __eq__(self, other):
-        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        return not (self == other)
-
-
 class GetPartitionsFilterSpec(object):
     """
     Attributes:
@@ -28208,6 +28208,13 @@
     None,  # 0
     (1, TType.LIST, 'values', (TType.I32, None, False), None, ),  # 1
 )
+all_structs.append(GetProjectionsSpec)
+GetProjectionsSpec.thrift_spec = (
+    None,  # 0
+    (1, TType.LIST, 'fieldList', (TType.STRING, 'UTF8', False), None, ),  # 1
+    (2, TType.STRING, 'includeParamKeyPattern', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'excludeParamKeyPattern', 'UTF8', None, ),  # 3
+)
 all_structs.append(GetTableRequest)
 GetTableRequest.thrift_spec = (
     None,  # 0
@@ -28732,13 +28739,6 @@
 all_structs.append(AlterTableResponse)
 AlterTableResponse.thrift_spec = (
 )
-all_structs.append(GetProjectionsSpec)
-GetProjectionsSpec.thrift_spec = (
-    None,  # 0
-    (1, TType.LIST, 'fieldList', (TType.STRING, 'UTF8', False), None, ),  # 1
-    (2, TType.STRING, 'includeParamKeyPattern', 'UTF8', None, ),  # 2
-    (3, TType.STRING, 'excludeParamKeyPattern', 'UTF8', None, ),  # 3
-)
 all_structs.append(GetPartitionsFilterSpec)
 GetPartitionsFilterSpec.thrift_spec = (
     None,  # 0
diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/hive_metastore_types.rb b/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/hive_metastore_types.rb
index b2d6f12..3420973 100644
--- a/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/hive_metastore_types.rb
+++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/hive_metastore_types.rb
@@ -576,6 +576,8 @@
 
 class ClientCapabilities; end
 
+class GetProjectionsSpec; end
+
 class GetTableRequest; end
 
 class GetTableResult; end
@@ -732,8 +734,6 @@
 
 class AlterTableResponse; end
 
-class GetProjectionsSpec; end
-
 class GetPartitionsFilterSpec; end
 
 class GetPartitionsResponse; end
@@ -4977,6 +4977,26 @@
   ::Thrift::Struct.generate_accessors self
 end
 
+class GetProjectionsSpec
+  include ::Thrift::Struct, ::Thrift::Struct_Union
+  FIELDLIST = 1
+  INCLUDEPARAMKEYPATTERN = 2
+  EXCLUDEPARAMKEYPATTERN = 3
+
+  FIELDS = {
+    FIELDLIST => {:type => ::Thrift::Types::LIST, :name => 'fieldList', :element => {:type => ::Thrift::Types::STRING}},
+    INCLUDEPARAMKEYPATTERN => {:type => ::Thrift::Types::STRING, :name => 'includeParamKeyPattern'},
+    EXCLUDEPARAMKEYPATTERN => {:type => ::Thrift::Types::STRING, :name => 'excludeParamKeyPattern'}
+  }
+
+  def struct_fields; FIELDS; end
+
+  def validate
+  end
+
+  ::Thrift::Struct.generate_accessors self
+end
+
 class GetTableRequest
   include ::Thrift::Struct, ::Thrift::Struct_Union
   DBNAME = 1
@@ -6611,26 +6631,6 @@
   ::Thrift::Struct.generate_accessors self
 end
 
-class GetProjectionsSpec
-  include ::Thrift::Struct, ::Thrift::Struct_Union
-  FIELDLIST = 1
-  INCLUDEPARAMKEYPATTERN = 2
-  EXCLUDEPARAMKEYPATTERN = 3
-
-  FIELDS = {
-    FIELDLIST => {:type => ::Thrift::Types::LIST, :name => 'fieldList', :element => {:type => ::Thrift::Types::STRING}},
-    INCLUDEPARAMKEYPATTERN => {:type => ::Thrift::Types::STRING, :name => 'includeParamKeyPattern'},
-    EXCLUDEPARAMKEYPATTERN => {:type => ::Thrift::Types::STRING, :name => 'excludeParamKeyPattern'}
-  }
-
-  def struct_fields; FIELDS; end
-
-  def validate
-  end
-
-  ::Thrift::Struct.generate_accessors self
-end
-
 class GetPartitionsFilterSpec
   include ::Thrift::Struct, ::Thrift::Struct_Union
   FILTERMODE = 7
diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
index d3cf66a..a7a780b 100644
--- a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
+++ b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
@@ -4675,125 +4675,4 @@
   public List<String> getAllStoredProcedures(ListStoredProcedureRequest request) throws MetaException, TException {
     return client.get_all_stored_procedures(request);
   }
-
-  /**
-   * Builder for the GetProjectionsSpec. This is a projection specification for partitions returned from the HMS.
-   */
-  public static class GetPartitionProjectionsSpecBuilder {
-
-    private List<String> partitionList = null;
-    private String includePartitionPattern = null;
-    private String excludePartitionPattern = null;
-
-    public void setPartitionList(List<String> partitionList) {
-      this.partitionList = partitionList;
-    }
-
-    public void setIncludePartitionPattern(String includePartitionPattern) {
-      this.includePartitionPattern = includePartitionPattern;
-    }
-
-    public void setExcludePartitionPattern(String excludePartitionPattern) {
-      this.excludePartitionPattern = excludePartitionPattern;
-    }
-
-    public GetProjectionsSpec build() {
-      return new GetProjectionsSpec(partitionList, includePartitionPattern, excludePartitionPattern);
-    }
-  }
-
-  /**
-   * Builder for the GetProjectionsSpec. This is a projection specification for tables returned from the HMS.
-   */
-  public static class GetTableProjectionsSpecBuilder {
-
-    private List<String> columnList = null;
-    private String includeColumnPattern = null;
-    private String excludeColumnPattern = null;
-
-    public void setColumnList(List<String> columnList) {
-      this.columnList = columnList;
-    }
-
-    public void setIncludeColumnPattern(String includeColumnPattern) {
-      this.includeColumnPattern = includeColumnPattern;
-    }
-
-    public void setExcludeColumnPattern(String excludeColumnPattern) {
-      this.excludeColumnPattern = excludeColumnPattern;
-    }
-
-    public GetProjectionsSpec build() {
-      return new GetProjectionsSpec(columnList, includeColumnPattern, excludeColumnPattern);
-    }
-  }
-
-  /**
-  * Builder for requiredFields bitmask to be sent via GetTablesExtRequest
-  */
-   public static class GetTablesRequestBuilder {
-    private int requestedFields = 0x0;
-    final static GetTablesExtRequestFields defValue = GetTablesExtRequestFields.ALL;
-
-    public GetTablesRequestBuilder() {
-    }
-
-    public GetTablesRequestBuilder with(GetTablesExtRequestFields type) {
-      switch (type) {
-      case ALL :
-          this.requestedFields |= Integer.MAX_VALUE;
-          break;
-      case PROCESSOR_CAPABILITIES :
-          this.requestedFields |= 0x2;
-          break;
-      case ACCESS_TYPE :
-          this.requestedFields |= 0x1;
-          break;
-      default:
-          this.requestedFields |= Integer.MAX_VALUE;
-          break;
-      }
-      return this;
-    }
-
-    public int bitValue() {
-      return this.requestedFields;
-    }
-
-    public static int defaultValue() {
-      return new GetTablesRequestBuilder().with(defValue).bitValue();
-    }
-  }
-
-  /**
-   * Builder for building table capabilities to be includes in TBLPROPERTIES
-   * during createTable
-   */
-   public static class TableCapabilityBuilder {
-    private String capabilitiesString = null;
-    public static final String KEY_CAPABILITIES = "OBJCAPABILITIES";
-
-    public TableCapabilityBuilder() {
-      capabilitiesString = "";
-    }
-
-    public TableCapabilityBuilder add(String skill) {
-      if (skill != null) {
-        capabilitiesString += skill + ",";
-      }
-      return this;
-    }
-
-    public String build() {
-      return this.capabilitiesString.substring(0, capabilitiesString.length() - 1);
-    }
-
-    public String getDBValue() {
-      return KEY_CAPABILITIES + "=" + build();
-    }
-
-    public static String getKey() {
-      return KEY_CAPABILITIES;
-    }
-  }
 }
diff --git a/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift b/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift
index 223787d..1790a4a 100644
--- a/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift
+++ b/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift
@@ -1430,6 +1430,42 @@
   1: required list<ClientCapability> values
 }
 
+/*
+ * Generic request API, providing different kinds of filtering and controlling output.
+ *
+ * The API entry point is get_partitions_with_specs() and getTables, which is based on a single
+ * request/response object model.
+ *
+ * The request defines any filtering that should be done for partitions as well as the list of fields that should be
+ * returned (this is called ProjectionSpec). Projection is simply a list of dot separated strings which represent
+ * the fields which that be returned. Projection may also include whitelist or blacklist of parameters to include in
+ * the partition. When both blacklist and whitelist are present, the blacklist supersedes the
+ * whitelist in case of conflicts.
+ *
+ * Filter spec is the generalization of various types of partition and table filtering. Partitions and tables can be
+ * filtered by names, by values or by partition expressions.
+ */
+
+struct GetProjectionsSpec {
+   // fieldList is a list of dot separated strings which represent the fields which must be returned.
+   // Any other field which is not in the fieldList may be unset in the returned partitions (it
+   //   is up to the implementation to decide whether it chooses to include or exclude such fields).
+   // E.g. setting the field list to sd.location, serdeInfo.name, sd.cols.name, sd.cols.type will
+   // return partitions which will have location field set in the storage descriptor. Also the serdeInfo
+   // in the returned storage descriptor will only have name field set. This applies to multi-valued
+   // fields as well like sd.cols, so in the example above only name and type fields will be set for sd.cols.
+   // If the fieldList is empty or not present, all the fields will be set
+   1: list<string> fieldList;
+   // SQL-92 compliant regex pattern for param keys to be included
+   // _ or % wildcards are supported. '_' represent one character and '%' represents 0 or more characters
+   // Currently this is unsupported when fetching tables.
+   2: string includeParamKeyPattern;
+   // SQL-92 compliant regex pattern for param keys to be excluded
+   // _ or % wildcards are supported. '_' represent one character and '%' represents 0 or more characters
+   // Current this is unsupported  when fetching tables.
+   3: string excludeParamKeyPattern;
+}
+
 struct GetTableRequest {
   1: required string dbName,
   2: required string tblName,
@@ -1923,43 +1959,6 @@
 struct AlterTableResponse {
 }
 
-/*
- * Generic Partition request API, providing different kinds of filtering and controlling output.
- *
- * The API entry point is get_partitions_with_specs(), which is based on a single
- * request/response object model.
- *
- * The request (GetPartitionsRequest) defines any filtering that should be done for partitions
- * as well as the list of fields that should be returned (this is called ProjectionSpec).
- * Projection is simply a list of dot separated strings which represent the fields which should
- * be returned. Projection may also include whitelist or blacklist of parameters to include in
- * the partition. When both blacklist and whitelist are present, the blacklist supersedes the
- * whitelist in case of conflicts.
- *
- * Partition filter spec is the generalization of various types of partition filtering.
- * Partitions can be filtered by names, by values or by partition expressions.
- */
-
-struct GetProjectionsSpec {
-   // fieldList is a list of dot separated strings which represent the fields which must be returned.
-   // Any other field which is not in the fieldList may be unset in the returned partitions (it
-   //   is up to the implementation to decide whether it chooses to include or exclude such fields).
-   // E.g. setting the field list to sd.location, serdeInfo.name, sd.cols.name, sd.cols.type will
-   // return partitions which will have location field set in the storage descriptor. Also the serdeInfo
-   // in the returned storage descriptor will only have name field set. This applies to multi-valued
-   // fields as well like sd.cols, so in the example above only name and type fields will be set for sd.cols.
-   // If the fieldList is empty or not present, all the fields will be set
-   1: list<string> fieldList;
-   // SQL-92 compliant regex pattern for param keys to be included
-   // _ or % wildcards are supported. '_' represent one character and '%' represents 0 or more characters
-   // Currently this is unsupported when fetching tables.
-   2: string includeParamKeyPattern;
-   // SQL-92 compliant regex pattern for param keys to be excluded
-   // _ or % wildcards are supported. '_' represent one character and '%' represents 0 or more characters
-   // Current this is unsupported  when fetching tables.
-   3: string excludeParamKeyPattern;
-}
-
 enum PartitionFilterMode {
    BY_NAMES,                 // filter by names
    BY_VALUES,                // filter by values
diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TableFields.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TableFields.java
index bda58c7..dc35f49 100644
--- a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TableFields.java
+++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TableFields.java
@@ -1,4 +1,4 @@
-/*
+ /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -35,6 +35,7 @@
             .put("tableName", "tableName")
             .put("dbName", "database.name")
             .put("owner", "owner")
+            .put("ownerType", "ownerType")
             .put("createTime", "createTime")
             .put("lastAccessTime", "lastAccessTime")
             .put("retention", "retention")
@@ -49,6 +50,7 @@
             .put("sd.serdeInfo.serializerClass", "sd.serDeInfo.serializerClass")
             .put("sd.serdeInfo.deserializerClass", "sd.serDeInfo.deserializerClass")
             .put("sd.serdeInfo.serdeType", "sd.serDeInfo.serdeType")
+            .put("sd.storedAsSubDirectories", "isStoredAsSubDirectories")
             .put("viewOriginalText", "viewOriginalText")
             .put("viewExpandedText", "viewExpandedText")
             .put("rewriteEnabled", "rewriteEnabled")
diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/GetPartitionProjectionsSpecBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/GetPartitionProjectionsSpecBuilder.java
new file mode 100644
index 0000000..1511f63
--- /dev/null
+++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/GetPartitionProjectionsSpecBuilder.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hive.metastore.client.builder;
+
+import org.apache.hadoop.hive.metastore.api.GetProjectionsSpec;
+
+import java.util.List;
+
+/**
+ * Builder for the GetProjectionsSpec. This is a projection specification for partitions returned from the HMS.
+ */
+public class GetPartitionProjectionsSpecBuilder {
+
+    private List<String> partitionList = null;
+    private String includePartitionPattern = null;
+    private String excludePartitionPattern = null;
+
+    public GetPartitionProjectionsSpecBuilder(List<String> partitionList, String includePartitionPattern,
+                                              String excludePartitionPattern) {
+        this.partitionList = partitionList;
+        this.includePartitionPattern = includePartitionPattern;
+        this.excludePartitionPattern = excludePartitionPattern;
+    }
+
+    public GetPartitionProjectionsSpecBuilder setPartitionList(List<String> partitionList) {
+        this.partitionList = partitionList;
+        return this;
+    }
+
+    public GetPartitionProjectionsSpecBuilder setIncludePartitionPattern(String includePartitionPattern) {
+        this.includePartitionPattern = includePartitionPattern;
+        return this;
+    }
+
+    public GetPartitionProjectionsSpecBuilder setExcludePartitionPattern(String excludePartitionPattern) {
+        this.excludePartitionPattern = excludePartitionPattern;
+        return this;
+    }
+
+    public GetProjectionsSpec build() {
+        return new GetProjectionsSpec(partitionList, includePartitionPattern, excludePartitionPattern);
+    }
+}
\ No newline at end of file
diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/GetPartitionsRequestBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/GetPartitionsRequestBuilder.java
new file mode 100644
index 0000000..4da7b02
--- /dev/null
+++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/GetPartitionsRequestBuilder.java
@@ -0,0 +1,123 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hive.metastore.client.builder;
+
+import org.apache.hadoop.hive.metastore.api.GetPartitionsFilterSpec;
+import org.apache.hadoop.hive.metastore.api.GetPartitionsRequest;
+import org.apache.hadoop.hive.metastore.api.GetProjectionsSpec;
+
+import java.util.List;
+
+public class GetPartitionsRequestBuilder {
+    private String catName = null;
+    private String dbName = null;
+    private String tblName = null;
+    private boolean withAuth = true;
+    private String user = null;
+    private List<String> groupNames = null;
+    private GetProjectionsSpec projectionSpec = null;
+    private GetPartitionsFilterSpec filterSpec = null;
+    private List<java.lang.String> processorCapabilities = null;
+    private String processorIdentifier = null;
+    private String validWriteIdList = null;
+
+    public GetPartitionsRequestBuilder(String catName, String dbName, String tblName, boolean withAuth, String user,
+                                       List<String> groupNames, GetProjectionsSpec projectionSpec,
+                                       GetPartitionsFilterSpec filterSpec, List<String> processorCapabilities,
+                                       String processorIdentifier, String validWriteIdList) {
+        this.catName = catName;
+        this.dbName = dbName;
+        this.tblName = tblName;
+        this.withAuth = withAuth;
+        this.user = user;
+        this.groupNames = groupNames;
+        this.projectionSpec = projectionSpec;
+        this.filterSpec = filterSpec;
+        this.processorCapabilities = processorCapabilities;
+        this.processorIdentifier = processorIdentifier;
+        this.validWriteIdList = validWriteIdList;
+    }
+
+    public GetPartitionsRequestBuilder setCatName(String catName) {
+        this.catName = catName;
+        return this;
+    }
+
+    public GetPartitionsRequestBuilder setDbName(String dbName) {
+        this.dbName = dbName;
+        return this;
+    }
+
+    public GetPartitionsRequestBuilder setTblName(String tblName) {
+        this.tblName = tblName;
+        return this;
+    }
+
+    public GetPartitionsRequestBuilder setWithAuth(boolean withAuth) {
+        this.withAuth = withAuth;
+        return this;
+    }
+
+    public GetPartitionsRequestBuilder setUser(String user) {
+        this.user = user;
+        return this;
+    }
+
+    public GetPartitionsRequestBuilder setGroupNames(List<String> groupNames) {
+        this.groupNames = groupNames;
+        return this;
+    }
+
+    public GetPartitionsRequestBuilder setProjectionSpec(GetProjectionsSpec projectionSpec) {
+        this.projectionSpec = projectionSpec;
+        return this;
+    }
+
+    public GetPartitionsRequestBuilder setFilterSpec(GetPartitionsFilterSpec filterSpec) {
+        this.filterSpec = filterSpec;
+        return this;
+    }
+
+    public GetPartitionsRequestBuilder setProcessorCapabilities(List<String> processorCapabilities) {
+        this.processorCapabilities = processorCapabilities;
+        return this;
+    }
+
+    public GetPartitionsRequestBuilder setProcessorIdentifier(String processorIdentifier) {
+        this.processorIdentifier = processorIdentifier;
+        return this;
+    }
+
+    public GetPartitionsRequestBuilder setValidWriteIdList(String validWriteIdList) {
+        this.validWriteIdList = validWriteIdList;
+        return this;
+    }
+
+    public GetPartitionsRequest build() {
+        GetPartitionsRequest partitionsRequest = new GetPartitionsRequest(dbName, tblName, projectionSpec, filterSpec);
+        partitionsRequest.setCatName(catName);
+        partitionsRequest.setWithAuth(withAuth);
+        partitionsRequest.setUser(user);
+        partitionsRequest.setGroupNames(groupNames);
+        partitionsRequest.setProcessorCapabilities(processorCapabilities);
+        partitionsRequest.setProcessorIdentifier(processorIdentifier);
+        partitionsRequest.setValidWriteIdList(validWriteIdList);
+        return partitionsRequest;
+    }
+}
\ No newline at end of file
diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/GetTableProjectionsSpecBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/GetTableProjectionsSpecBuilder.java
new file mode 100644
index 0000000..5d0503e
--- /dev/null
+++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/GetTableProjectionsSpecBuilder.java
@@ -0,0 +1,260 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hive.metastore.client.builder;
+
+import org.apache.hadoop.hive.metastore.api.GetProjectionsSpec;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Builder for the GetProjectionsSpec. This is a projection specification for tables returned from the HMS.
+ */
+public class GetTableProjectionsSpecBuilder {
+
+    private List<String> columnList = null;
+    private String includeColumnPattern = null;
+    private String excludeColumnPattern = null;
+
+    public GetTableProjectionsSpecBuilder(List<String> columnList, String includeColumnPattern,
+                                          String excludeColumnPattern) {
+        this.columnList = columnList;
+        this.includeColumnPattern = includeColumnPattern;
+        this.excludeColumnPattern = excludeColumnPattern;
+    }
+
+    public GetTableProjectionsSpecBuilder() {
+    }
+
+    public GetTableProjectionsSpecBuilder setColumnList(List<String> columnList) {
+        this.columnList = columnList;
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder setIncludeColumnPattern(String includeColumnPattern) {
+        this.includeColumnPattern = includeColumnPattern;
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder setExcludeColumnPattern(String excludeColumnPattern) {
+        this.excludeColumnPattern = excludeColumnPattern;
+        return this;
+    }
+
+    private void initColumnListAndAddCol(String colName) {
+        if (this.columnList == null) {
+            this.columnList = new ArrayList<String>();
+        }
+        this.columnList.add(colName);
+    }
+
+    public GetTableProjectionsSpecBuilder includeTableName() {
+        initColumnListAndAddCol("tableName");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeDatabase() {
+        initColumnListAndAddCol("dbName");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeSdCdColsName() {
+        initColumnListAndAddCol("sd.cols.name");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeSdCdColsType() {
+        initColumnListAndAddCol("sd.cols.type");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeSdCdColsComment() {
+        initColumnListAndAddCol("sd.cols.comment");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeSdLocation() {
+        initColumnListAndAddCol("sd.location");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeSdInputFormat() {
+        initColumnListAndAddCol("sd.inputFormat");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeSdOutputFormat() {
+        initColumnListAndAddCol("sd.outputFormat");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeSdIsCompressed() {
+        initColumnListAndAddCol("sd.compressed");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeSdNumBuckets() {
+        initColumnListAndAddCol("sd.numBuckets");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeSdSerDeInfoName() {
+        initColumnListAndAddCol("sd.serdeInfo.name");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeSdSerDeInfoSerializationLib() {
+        initColumnListAndAddCol("sd.serdeInfo.serializationLib");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeSdSerDeInfoParameters() {
+        initColumnListAndAddCol("sd.serdeInfo.parameters");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeSdSerDeInfoDescription() {
+        initColumnListAndAddCol("sd.serdeInfo.description");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeSdSerDeInfoSerializerClass() {
+        initColumnListAndAddCol("sd.serdeInfo.serializerClass");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeSdSerDeInfoDeserializerClass() {
+        initColumnListAndAddCol("sd.serdeInfo.deserializerClass");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeSdSerDeInfoSerdeType() {
+        initColumnListAndAddCol("sd.serdeInfo.serdeType");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeSdBucketCols() {
+        initColumnListAndAddCol("sd.bucketCols");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeSdSortColsCol() {
+        initColumnListAndAddCol("sd.sortCols.col");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeSdSortColsOrder() {
+        initColumnListAndAddCol("sd.sortCols.order");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeSdparameters() {
+        initColumnListAndAddCol("sd.parameters");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeSdSkewedColNames() {
+        initColumnListAndAddCol("sd.skewedInfo.skewedColNames");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeSdSkewedColValues() {
+        initColumnListAndAddCol("sd.skewedInfo.skewedColValues");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeSdSkewedColValueLocationMaps() {
+        initColumnListAndAddCol("sd.skewedInfo.skewedColValueLocationMaps");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeSdIsStoredAsSubDirectories() {
+        initColumnListAndAddCol("sd.storedAsSubDirectories");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeOwner() {
+        initColumnListAndAddCol("owner");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeOwnerType() {
+        initColumnListAndAddCol("ownerType");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeCreateTime() {
+        initColumnListAndAddCol("createTime");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeLastAccessTime() {
+        initColumnListAndAddCol("lastAccessTime");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeRetention() {
+        initColumnListAndAddCol("retention");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includePartitionKeysName() {
+        initColumnListAndAddCol("partitionKeys.name");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includePartitionKeysType() {
+        initColumnListAndAddCol("partitionKeys.type");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includePartitionKeysComment() {
+        initColumnListAndAddCol("partitionKeys.comment");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeParameters() {
+        initColumnListAndAddCol("parameters");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeViewOriginalText() {
+        initColumnListAndAddCol("viewOriginalText");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeViewExpandedText() {
+        initColumnListAndAddCol("viewExpandedText");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeRewriteEnabled() {
+        initColumnListAndAddCol("rewriteEnabled");
+        return this;
+    }
+
+    public GetTableProjectionsSpecBuilder includeTableType() {
+        initColumnListAndAddCol("tableType");
+        return this;
+    }
+
+    public GetProjectionsSpec build() {
+        return new GetProjectionsSpec(columnList, includeColumnPattern, excludeColumnPattern);
+    }
+}
\ No newline at end of file
diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/GetTablesRequestBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/GetTablesRequestBuilder.java
new file mode 100644
index 0000000..bc07c7e
--- /dev/null
+++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/GetTablesRequestBuilder.java
@@ -0,0 +1,130 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hive.metastore.client.builder;
+
+import org.apache.hadoop.hive.metastore.api.ClientCapabilities;
+import org.apache.hadoop.hive.metastore.api.GetProjectionsSpec;
+import org.apache.hadoop.hive.metastore.api.GetTablesExtRequestFields;
+import org.apache.hadoop.hive.metastore.api.GetTablesRequest;
+
+import java.util.List;
+
+/**
+ * Builder for requiredFields bitmask to be sent via GetTablesExtRequest
+ */
+public class GetTablesRequestBuilder {
+    private String dbName = null;
+    private List<String> tblNames = null;
+    private ClientCapabilities capabilities = null;
+    private String catName = null;
+    private List<String> processorCapabilities = null;
+    private String processorIdentifier = null;
+    private GetProjectionsSpec projectionsSpec = null;
+    private int requestedFields = 0x0;
+    final static GetTablesExtRequestFields defValue = GetTablesExtRequestFields.ALL;
+
+    public GetTablesRequestBuilder() {
+    }
+
+    public GetTablesRequestBuilder(String dbName, List<String> tblNames, ClientCapabilities capabilities,
+                                   String catName, List<String> processorCapabilities, String processorIdentifier,
+                                   GetProjectionsSpec projectionsSpec, int requestedFields) {
+        this.dbName = dbName;
+        this.tblNames = tblNames;
+        this.capabilities = capabilities;
+        this.catName = catName;
+        this.processorCapabilities = processorCapabilities;
+        this.processorIdentifier = processorIdentifier;
+        this.projectionsSpec = projectionsSpec;
+        this.requestedFields = requestedFields;
+    }
+
+    public GetTablesRequestBuilder setDbName(String dbName) {
+        this.dbName = dbName;
+        return this;
+    }
+
+    public GetTablesRequestBuilder setTblNames(List<String> tblNames) {
+        this.tblNames = tblNames;
+        return this;
+    }
+
+    public GetTablesRequestBuilder setCapabilities(ClientCapabilities capabilities) {
+        this.capabilities = capabilities;
+        return this;
+    }
+
+    public GetTablesRequestBuilder setCatName(String catName) {
+        this.catName = catName;
+        return this;
+    }
+
+    public GetTablesRequestBuilder setProcessorCapabilities(List<String> processorCapabilities) {
+        this.processorCapabilities = processorCapabilities;
+        return this;
+    }
+
+    public GetTablesRequestBuilder setProcessorIdentifier(String processorIdentifier) {
+        this.processorIdentifier = processorIdentifier;
+        return this;
+    }
+
+    public GetTablesRequestBuilder setGetProjectionsSpec(GetProjectionsSpec projectionsSpec) {
+        this.projectionsSpec = projectionsSpec;
+        return this;
+    }
+
+    public GetTablesRequestBuilder with(GetTablesExtRequestFields type) {
+        switch (type) {
+            case ALL:
+                this.requestedFields |= Integer.MAX_VALUE;
+                break;
+            case PROCESSOR_CAPABILITIES:
+                this.requestedFields |= 0x2;
+                break;
+            case ACCESS_TYPE:
+                this.requestedFields |= 0x1;
+                break;
+            default:
+                this.requestedFields |= Integer.MAX_VALUE;
+                break;
+        }
+        return this;
+    }
+
+    public int bitValue() {
+        return this.requestedFields;
+    }
+
+    public static int defaultValue() {
+        return new GetTablesRequestBuilder().with(defValue).bitValue();
+    }
+
+    public GetTablesRequest build() {
+        GetTablesRequest tablesRequest = new GetTablesRequest();
+        tablesRequest.setDbName(dbName);
+        tablesRequest.setTblNames(tblNames);
+        tablesRequest.setCapabilities(capabilities);
+        tablesRequest.setCatName(catName);
+        tablesRequest.setProcessorCapabilities(processorCapabilities);
+        tablesRequest.setProcessorIdentifier(processorIdentifier);
+        tablesRequest.setProjectionSpec(projectionsSpec);
+        return tablesRequest;
+    }
+}
\ No newline at end of file
diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/TableCapabilityBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/TableCapabilityBuilder.java
new file mode 100644
index 0000000..06ee629
--- /dev/null
+++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/TableCapabilityBuilder.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hive.metastore.client.builder;
+
+/**
+ * Builder for building table capabilities to be includes in TBLPROPERTIES
+ * during createTable
+ */
+public class TableCapabilityBuilder {
+    private String capabilitiesString = null;
+    public static final String KEY_CAPABILITIES = "OBJCAPABILITIES";
+
+    public TableCapabilityBuilder() {
+        capabilitiesString = "";
+    }
+
+    public TableCapabilityBuilder add(String skill) {
+        if (skill != null) {
+            capabilitiesString += skill + ",";
+        }
+        return this;
+    }
+
+    public String build() {
+        return this.capabilitiesString.substring(0, capabilitiesString.length() - 1);
+    }
+
+    public String getDBValue() {
+        return KEY_CAPABILITIES + "=" + build();
+    }
+
+    public static String getKey() {
+        return KEY_CAPABILITIES;
+    }
+}
diff --git a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesGetExists.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesGetExists.java
index 1c65eb6..3f1bef0 100644
--- a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesGetExists.java
+++ b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesGetExists.java
@@ -25,6 +25,7 @@
 import org.apache.hadoop.hive.metastore.api.*;
 import org.apache.hadoop.hive.metastore.client.builder.CatalogBuilder;
 import org.apache.hadoop.hive.metastore.client.builder.DatabaseBuilder;
+import org.apache.hadoop.hive.metastore.client.builder.GetTableProjectionsSpecBuilder;
 import org.apache.hadoop.hive.metastore.client.builder.TableBuilder;
 import org.apache.hadoop.hive.metastore.minihms.AbstractMetaStoreService;
 import org.apache.thrift.TException;
@@ -399,9 +400,7 @@
     tableNames.add(testTables[0].getTableName());
     tableNames.add(testTables[1].getTableName());
 
-    List<String> projectedFields = Collections.singletonList("sd.location");
-    GetProjectionsSpec projectSpec = new GetProjectionsSpec();
-    projectSpec.setFieldList(projectedFields);
+    GetProjectionsSpec projectSpec = (new GetTableProjectionsSpecBuilder()).includeSdLocation().build();
 
     List<Table> tables = client.getTables(null, DEFAULT_DATABASE, tableNames, projectSpec);
     Assert.assertEquals("Found tables", 2, tables.size());
@@ -431,8 +430,7 @@
     tableNames.add(testTables[0].getTableName());
     tableNames.add(testTables[1].getTableName());
 
-    GetProjectionsSpec projectSpec = new GetProjectionsSpec();
-    projectSpec.setExcludeParamKeyPattern("foo");
+    GetProjectionsSpec projectSpec = (new GetTableProjectionsSpecBuilder()).setExcludeColumnPattern("foo").build();
 
     Assert.assertThrows(Exception.class, ()->client.getTables(null, DEFAULT_DATABASE, tableNames, projectSpec));
   }
@@ -443,9 +441,8 @@
     tableNames.add(testTables[0].getTableName());
     tableNames.add(testTables[1].getTableName());
 
-    GetProjectionsSpec projectSpec = new GetProjectionsSpec();
-    List<String> projectedFields = Arrays.asList("Invalid1");
-    projectSpec.setFieldList(projectedFields);
+    GetProjectionsSpec projectSpec = (new GetTableProjectionsSpecBuilder()).setColumnList(Arrays.asList("Invalid1"))
+            .build();
 
     Assert.assertThrows(Exception.class, ()->client.getTables(null, DEFAULT_DATABASE, tableNames, projectSpec));
   }
@@ -457,9 +454,8 @@
     tableNames.add(testTables[0].getTableName());
     tableNames.add(testTables[1].getTableName());
 
-    GetProjectionsSpec projectSpec = new GetProjectionsSpec();
-    List<String> projectedFields = Arrays.asList("Invalid1", "Invalid2");
-    projectSpec.setFieldList(projectedFields);
+    GetProjectionsSpec projectSpec = (new GetTableProjectionsSpecBuilder())
+            .setColumnList(Arrays.asList("Invalid1", "Invalid2")).build();
 
     Assert.assertThrows(Exception.class, ()->client.getTables(null, DEFAULT_DATABASE, tableNames, projectSpec));
   }
@@ -470,9 +466,7 @@
     tableNames.add(testTables[0].getTableName());
     tableNames.add(testTables[1].getTableName());
 
-    GetProjectionsSpec projectSpec = new GetProjectionsSpec();
-    List<String> projectedFields = Arrays.asList();
-    projectSpec.setFieldList(projectedFields);
+    GetProjectionsSpec projectSpec = (new GetTableProjectionsSpecBuilder()).build();
 
     List<Table> tables = client.getTables(null, DEFAULT_DATABASE, tableNames, projectSpec);
 
@@ -480,14 +474,13 @@
   }
 
   @Test
-  public void testGetTableObjectsWithProjectionOfMultipleField() throws Exception {
+  public void testGetTableObjectsWithProjectionOfMultipleField_1() throws Exception {
     List<String> tableNames = new ArrayList<>();
     tableNames.add(testTables[0].getTableName());
     tableNames.add(testTables[1].getTableName());
 
-    GetProjectionsSpec projectSpec = new GetProjectionsSpec();
-    List<String> projectedFields = Arrays.asList("dbName", "tableName", "createTime", "lastAccessTime");
-    projectSpec.setFieldList(projectedFields);
+    GetProjectionsSpec projectSpec = (new GetTableProjectionsSpecBuilder()).includeDatabase().includeTableName()
+            .includeCreateTime().includeLastAccessTime().build();
 
     List<Table> tables = client.getTables(null, DEFAULT_DATABASE, tableNames, projectSpec);
 
@@ -498,6 +491,32 @@
       Assert.assertTrue(table.isSetTableName());
       Assert.assertTrue(table.isSetCreateTime());
       Assert.assertFalse(table.isSetSd());
+      Assert.assertFalse(table.isSetOwner());
+    }
+  }
+
+  @Test
+  public void testGetTableObjectsWithProjectionOfMultipleField_2() throws Exception {
+    List<String> tableNames = new ArrayList<>();
+    tableNames.add(testTables[0].getTableName());
+    tableNames.add(testTables[1].getTableName());
+
+    GetProjectionsSpec projectSpec = (new GetTableProjectionsSpecBuilder()).includeOwner().includeOwnerType().
+            includeSdLocation().build();
+
+    List<Table> tables = client.getTables(null, DEFAULT_DATABASE, tableNames, projectSpec);
+
+    Assert.assertEquals("Found tables", 2, tables.size());
+
+    for(Table table : tables) {
+      Assert.assertFalse(table.isSetDbName());
+      Assert.assertFalse(table.isSetTableName());
+      Assert.assertTrue(table.isSetCreateTime());
+      Assert.assertTrue(table.isSetSd());
+      Assert.assertTrue(table.isSetOwnerType());
+      Assert.assertTrue(table.isSetOwner());
+      StorageDescriptor sd = table.getSd();
+      Assert.assertTrue(sd.isSetLocation());
     }
   }
 
@@ -507,9 +526,8 @@
     tableNames.add(testTables[0].getTableName());
     tableNames.add(testTables[1].getTableName());
 
-    GetProjectionsSpec projectSpec = new GetProjectionsSpec();
-    List<String> projectedFields = Arrays.asList("sd.serdeInfo.name", "sd.serdeInfo.serializationLib", "sd.serdeInfo.description");
-    projectSpec.setFieldList(projectedFields);
+    GetProjectionsSpec projectSpec = (new GetTableProjectionsSpecBuilder()).includeSdSerDeInfoSerializationLib()
+            .build();
 
     List<Table> tables = client.getTables(null, DEFAULT_DATABASE, tableNames, projectSpec);
 
@@ -532,9 +550,8 @@
     tableNames.add(testTables[0].getTableName());
     tableNames.add(testTables[1].getTableName());
 
-    GetProjectionsSpec projectSpec = new GetProjectionsSpec();
-    List<String> projectedFields = Arrays.asList("sd.cols.name", "sd.serdeInfo.name", "sd.serdeInfo.serializationLib", "sd.serdeInfo.parameters");
-    projectSpec.setFieldList(projectedFields);
+    GetProjectionsSpec projectSpec = (new GetTableProjectionsSpecBuilder()).includeSdLocation().includeSdSerDeInfoName()
+            .includeSdSerDeInfoSerializationLib().includeSdSerDeInfoParameters().build();
 
     List<Table> tables = client.getTables(null, DEFAULT_DATABASE, tableNames, projectSpec);
 
@@ -556,6 +573,74 @@
   }
 
   @Test
+  public void testGetTableProjectionSpecification() throws Exception {
+    List<String> tableNames = new ArrayList<>();
+    tableNames.add(testTables[0].getTableName());
+    tableNames.add(testTables[1].getTableName());
+
+    GetProjectionsSpec projectSpec = (new GetTableProjectionsSpecBuilder())
+            .includeTableName()
+            .includeDatabase()
+            .includeSdCdColsName()
+            .includeSdCdColsType()
+            .includeSdCdColsComment()
+            .includeSdLocation()
+            .includeSdInputFormat()
+            .includeSdOutputFormat()
+            .includeSdIsCompressed()
+            .includeSdNumBuckets()
+            .includeSdSerDeInfoName()
+            .includeSdSerDeInfoSerializationLib()
+            .includeSdSerDeInfoParameters()
+            .includeSdSerDeInfoDescription()
+            .includeSdSerDeInfoSerializerClass()
+            .includeSdSerDeInfoDeserializerClass()
+            .includeSdSerDeInfoSerdeType()
+            .includeSdBucketCols()
+            .includeSdSortColsCol()
+            .includeSdSortColsOrder()
+            .includeSdparameters()
+            .includeSdSkewedColNames()
+            .includeSdSkewedColValues()
+            .includeSdSkewedColValueLocationMaps()
+            .includeSdIsStoredAsSubDirectories()
+            .includeOwner()
+            .includeOwnerType()
+            .includeCreateTime()
+            .includeLastAccessTime()
+            .includeRetention()
+            .includePartitionKeysName()
+            .includePartitionKeysType()
+            .includePartitionKeysComment()
+            .includeParameters()
+            .includeViewOriginalText()
+            .includeRewriteEnabled()
+            .includeTableType()
+            .build();
+
+    List<Table> tables = client.getTables(null, DEFAULT_DATABASE, tableNames, projectSpec);
+
+    Assert.assertEquals("Found tables", 2, tables.size());
+
+    for(Table table : tables) {
+      Assert.assertTrue(table.isSetDbName());
+      Assert.assertTrue(table.isSetCatName());
+      Assert.assertTrue(table.isSetTableName());
+      Assert.assertTrue(table.isSetLastAccessTime());
+      Assert.assertTrue(table.isSetSd());
+      StorageDescriptor sd = table.getSd();
+      Assert.assertTrue(sd.isSetCols());
+      Assert.assertTrue(sd.isSetSerdeInfo());
+      Assert.assertTrue(sd.isSetBucketCols());
+      Assert.assertTrue(sd.isSetCompressed());
+      Assert.assertTrue(sd.isSetInputFormat());
+      Assert.assertTrue(sd.isSetSerdeInfo());
+      SerDeInfo serDeInfo = sd.getSerdeInfo();
+      Assert.assertTrue(serDeInfo.isSetSerializationLib());
+    }
+  }
+
+  @Test
   public void testGetTableObjectsByNameCaseInsensitive() throws Exception {
     Table table = testTables[0];