FAQ
Repository: hive
Updated Branches:
   refs/heads/master 26535378f -> 3e0d87f81


http://git-wip-us.apache.org/repos/asf/hive/blob/3e0d87f8/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp b/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp
index 5fd4a90..cb0ee7a 100644
--- a/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp
+++ b/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp
@@ -151,14 +151,6 @@ const char* _kResourceTypeNames[] = {
  };
  const std::map<int, const char*> _ResourceType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(3, _kResourceTypeValues, _kResourceTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));

-int _kFileMetadataExprTypeValues[] = {
- FileMetadataExprType::ORC_SARG
-};
-const char* _kFileMetadataExprTypeNames[] = {
- "ORC_SARG"
-};
-const std::map<int, const char*> _FileMetadataExprType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(1, _kFileMetadataExprTypeValues, _kFileMetadataExprTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
-

  Version::~Version() throw() {
  }
@@ -14270,11 +14262,6 @@ void GetFileMetadataByExprRequest::__set_doGetFooters(const bool val) {
  __isset.doGetFooters = true;
  }

-void GetFileMetadataByExprRequest::__set_type(const FileMetadataExprType::type val) {
- this->type = val;
-__isset.type = true;
-}
-
  uint32_t GetFileMetadataByExprRequest::read(::apache::thrift::protocol::TProtocol* iprot) {

    apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
@@ -14334,16 +14321,6 @@ uint32_t GetFileMetadataByExprRequest::read(::apache::thrift::protocol::TProtoco
            xfer += iprot->skip(ftype);
          }
          break;
- case 4:
- if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast626;
- xfer += iprot->readI32(ecast626);
- this->type = (FileMetadataExprType::type)ecast626;
- this->__isset.type = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
        default:
          xfer += iprot->skip(ftype);
          break;
@@ -14368,10 +14345,10 @@ uint32_t GetFileMetadataByExprRequest::write(::apache::thrift::protocol::TProtoc
    xfer += oprot->writeFieldBegin("fileIds", ::apache::thrift::protocol::T_LIST, 1);
    {
      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I64, static_cast<uint32_t>(this->fileIds.size()));
- std::vector<int64_t> ::const_iterator _iter627;
- for (_iter627 = this->fileIds.begin(); _iter627 != this->fileIds.end(); ++_iter627)
+ std::vector<int64_t> ::const_iterator _iter626;
+ for (_iter626 = this->fileIds.begin(); _iter626 != this->fileIds.end(); ++_iter626)
      {
- xfer += oprot->writeI64((*_iter627));
+ xfer += oprot->writeI64((*_iter626));
      }
      xfer += oprot->writeListEnd();
    }
@@ -14386,11 +14363,6 @@ uint32_t GetFileMetadataByExprRequest::write(::apache::thrift::protocol::TProtoc
      xfer += oprot->writeBool(this->doGetFooters);
      xfer += oprot->writeFieldEnd();
    }
- if (this->__isset.type) {
- xfer += oprot->writeFieldBegin("type", ::apache::thrift::protocol::T_I32, 4);
- xfer += oprot->writeI32((int32_t)this->type);
- xfer += oprot->writeFieldEnd();
- }
    xfer += oprot->writeFieldStop();
    xfer += oprot->writeStructEnd();
    return xfer;
@@ -14401,23 +14373,20 @@ void swap(GetFileMetadataByExprRequest &a, GetFileMetadataByExprRequest &b) {
    swap(a.fileIds, b.fileIds);
    swap(a.expr, b.expr);
    swap(a.doGetFooters, b.doGetFooters);
- swap(a.type, b.type);
    swap(a.__isset, b.__isset);
  }

-GetFileMetadataByExprRequest::GetFileMetadataByExprRequest(const GetFileMetadataByExprRequest& other628) {
+GetFileMetadataByExprRequest::GetFileMetadataByExprRequest(const GetFileMetadataByExprRequest& other627) {
+ fileIds = other627.fileIds;
+ expr = other627.expr;
+ doGetFooters = other627.doGetFooters;
+ __isset = other627.__isset;
+}
+GetFileMetadataByExprRequest& GetFileMetadataByExprRequest::operator=(const GetFileMetadataByExprRequest& other628) {
    fileIds = other628.fileIds;
    expr = other628.expr;
    doGetFooters = other628.doGetFooters;
- type = other628.type;
    __isset = other628.__isset;
-}
-GetFileMetadataByExprRequest& GetFileMetadataByExprRequest::operator=(const GetFileMetadataByExprRequest& other629) {
- fileIds = other629.fileIds;
- expr = other629.expr;
- doGetFooters = other629.doGetFooters;
- type = other629.type;
- __isset = other629.__isset;
    return *this;
  }
  void GetFileMetadataByExprRequest::printTo(std::ostream& out) const {
@@ -14426,7 +14395,6 @@ void GetFileMetadataByExprRequest::printTo(std::ostream& out) const {
    out << "fileIds=" << to_string(fileIds);
    out << ", " << "expr=" << to_string(expr);
    out << ", " << "doGetFooters="; (__isset.doGetFooters ? (out << to_string(doGetFooters)) : (out << "<null>"));
- out << ", " << "type="; (__isset.type ? (out << to_string(type)) : (out << "<null>"));
    out << ")";
  }

@@ -14470,17 +14438,17 @@ uint32_t GetFileMetadataResult::read(::apache::thrift::protocol::TProtocol* ipro
          if (ftype == ::apache::thrift::protocol::T_MAP) {
            {
              this->metadata.clear();
- uint32_t _size630;
- ::apache::thrift::protocol::TType _ktype631;
- ::apache::thrift::protocol::TType _vtype632;
- xfer += iprot->readMapBegin(_ktype631, _vtype632, _size630);
- uint32_t _i634;
- for (_i634 = 0; _i634 < _size630; ++_i634)
+ uint32_t _size629;
+ ::apache::thrift::protocol::TType _ktype630;
+ ::apache::thrift::protocol::TType _vtype631;
+ xfer += iprot->readMapBegin(_ktype630, _vtype631, _size629);
+ uint32_t _i633;
+ for (_i633 = 0; _i633 < _size629; ++_i633)
              {
- int64_t _key635;
- xfer += iprot->readI64(_key635);
- std::string& _val636 = this->metadata[_key635];
- xfer += iprot->readBinary(_val636);
+ int64_t _key634;
+ xfer += iprot->readI64(_key634);
+ std::string& _val635 = this->metadata[_key634];
+ xfer += iprot->readBinary(_val635);
              }
              xfer += iprot->readMapEnd();
            }
@@ -14521,11 +14489,11 @@ uint32_t GetFileMetadataResult::write(::apache::thrift::protocol::TProtocol* opr
    xfer += oprot->writeFieldBegin("metadata", ::apache::thrift::protocol::T_MAP, 1);
    {
      xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I64, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->metadata.size()));
- std::map<int64_t, std::string> ::const_iterator _iter637;
- for (_iter637 = this->metadata.begin(); _iter637 != this->metadata.end(); ++_iter637)
+ std::map<int64_t, std::string> ::const_iterator _iter636;
+ for (_iter636 = this->metadata.begin(); _iter636 != this->metadata.end(); ++_iter636)
      {
- xfer += oprot->writeI64(_iter637->first);
- xfer += oprot->writeBinary(_iter637->second);
+ xfer += oprot->writeI64(_iter636->first);
+ xfer += oprot->writeBinary(_iter636->second);
      }
      xfer += oprot->writeMapEnd();
    }
@@ -14546,13 +14514,13 @@ void swap(GetFileMetadataResult &a, GetFileMetadataResult &b) {
    swap(a.isSupported, b.isSupported);
  }

-GetFileMetadataResult::GetFileMetadataResult(const GetFileMetadataResult& other638) {
+GetFileMetadataResult::GetFileMetadataResult(const GetFileMetadataResult& other637) {
+ metadata = other637.metadata;
+ isSupported = other637.isSupported;
+}
+GetFileMetadataResult& GetFileMetadataResult::operator=(const GetFileMetadataResult& other638) {
    metadata = other638.metadata;
    isSupported = other638.isSupported;
-}
-GetFileMetadataResult& GetFileMetadataResult::operator=(const GetFileMetadataResult& other639) {
- metadata = other639.metadata;
- isSupported = other639.isSupported;
    return *this;
  }
  void GetFileMetadataResult::printTo(std::ostream& out) const {
@@ -14598,14 +14566,14 @@ uint32_t GetFileMetadataRequest::read(::apache::thrift::protocol::TProtocol* ipr
          if (ftype == ::apache::thrift::protocol::T_LIST) {
            {
              this->fileIds.clear();
- uint32_t _size640;
- ::apache::thrift::protocol::TType _etype643;
- xfer += iprot->readListBegin(_etype643, _size640);
- this->fileIds.resize(_size640);
- uint32_t _i644;
- for (_i644 = 0; _i644 < _size640; ++_i644)
+ uint32_t _size639;
+ ::apache::thrift::protocol::TType _etype642;
+ xfer += iprot->readListBegin(_etype642, _size639);
+ this->fileIds.resize(_size639);
+ uint32_t _i643;
+ for (_i643 = 0; _i643 < _size639; ++_i643)
              {
- xfer += iprot->readI64(this->fileIds[_i644]);
+ xfer += iprot->readI64(this->fileIds[_i643]);
              }
              xfer += iprot->readListEnd();
            }
@@ -14636,10 +14604,10 @@ uint32_t GetFileMetadataRequest::write(::apache::thrift::protocol::TProtocol* op
    xfer += oprot->writeFieldBegin("fileIds", ::apache::thrift::protocol::T_LIST, 1);
    {
      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I64, static_cast<uint32_t>(this->fileIds.size()));
- std::vector<int64_t> ::const_iterator _iter645;
- for (_iter645 = this->fileIds.begin(); _iter645 != this->fileIds.end(); ++_iter645)
+ std::vector<int64_t> ::const_iterator _iter644;
+ for (_iter644 = this->fileIds.begin(); _iter644 != this->fileIds.end(); ++_iter644)
      {
- xfer += oprot->writeI64((*_iter645));
+ xfer += oprot->writeI64((*_iter644));
      }
      xfer += oprot->writeListEnd();
    }
@@ -14655,11 +14623,11 @@ void swap(GetFileMetadataRequest &a, GetFileMetadataRequest &b) {
    swap(a.fileIds, b.fileIds);
  }

-GetFileMetadataRequest::GetFileMetadataRequest(const GetFileMetadataRequest& other646) {
- fileIds = other646.fileIds;
+GetFileMetadataRequest::GetFileMetadataRequest(const GetFileMetadataRequest& other645) {
+ fileIds = other645.fileIds;
  }
-GetFileMetadataRequest& GetFileMetadataRequest::operator=(const GetFileMetadataRequest& other647) {
- fileIds = other647.fileIds;
+GetFileMetadataRequest& GetFileMetadataRequest::operator=(const GetFileMetadataRequest& other646) {
+ fileIds = other646.fileIds;
    return *this;
  }
  void GetFileMetadataRequest::printTo(std::ostream& out) const {
@@ -14718,11 +14686,11 @@ void swap(PutFileMetadataResult &a, PutFileMetadataResult &b) {
    (void) b;
  }

-PutFileMetadataResult::PutFileMetadataResult(const PutFileMetadataResult& other648) {
- (void) other648;
+PutFileMetadataResult::PutFileMetadataResult(const PutFileMetadataResult& other647) {
+ (void) other647;
  }
-PutFileMetadataResult& PutFileMetadataResult::operator=(const PutFileMetadataResult& other649) {
- (void) other649;
+PutFileMetadataResult& PutFileMetadataResult::operator=(const PutFileMetadataResult& other648) {
+ (void) other648;
    return *this;
  }
  void PutFileMetadataResult::printTo(std::ostream& out) const {
@@ -14771,14 +14739,14 @@ uint32_t PutFileMetadataRequest::read(::apache::thrift::protocol::TProtocol* ipr
          if (ftype == ::apache::thrift::protocol::T_LIST) {
            {
              this->fileIds.clear();
- uint32_t _size650;
- ::apache::thrift::protocol::TType _etype653;
- xfer += iprot->readListBegin(_etype653, _size650);
- this->fileIds.resize(_size650);
- uint32_t _i654;
- for (_i654 = 0; _i654 < _size650; ++_i654)
+ uint32_t _size649;
+ ::apache::thrift::protocol::TType _etype652;
+ xfer += iprot->readListBegin(_etype652, _size649);
+ this->fileIds.resize(_size649);
+ uint32_t _i653;
+ for (_i653 = 0; _i653 < _size649; ++_i653)
              {
- xfer += iprot->readI64(this->fileIds[_i654]);
+ xfer += iprot->readI64(this->fileIds[_i653]);
              }
              xfer += iprot->readListEnd();
            }
@@ -14791,14 +14759,14 @@ uint32_t PutFileMetadataRequest::read(::apache::thrift::protocol::TProtocol* ipr
          if (ftype == ::apache::thrift::protocol::T_LIST) {
            {
              this->metadata.clear();
- uint32_t _size655;
- ::apache::thrift::protocol::TType _etype658;
- xfer += iprot->readListBegin(_etype658, _size655);
- this->metadata.resize(_size655);
- uint32_t _i659;
- for (_i659 = 0; _i659 < _size655; ++_i659)
+ uint32_t _size654;
+ ::apache::thrift::protocol::TType _etype657;
+ xfer += iprot->readListBegin(_etype657, _size654);
+ this->metadata.resize(_size654);
+ uint32_t _i658;
+ for (_i658 = 0; _i658 < _size654; ++_i658)
              {
- xfer += iprot->readBinary(this->metadata[_i659]);
+ xfer += iprot->readBinary(this->metadata[_i658]);
              }
              xfer += iprot->readListEnd();
            }
@@ -14831,10 +14799,10 @@ uint32_t PutFileMetadataRequest::write(::apache::thrift::protocol::TProtocol* op
    xfer += oprot->writeFieldBegin("fileIds", ::apache::thrift::protocol::T_LIST, 1);
    {
      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I64, static_cast<uint32_t>(this->fileIds.size()));
- std::vector<int64_t> ::const_iterator _iter660;
- for (_iter660 = this->fileIds.begin(); _iter660 != this->fileIds.end(); ++_iter660)
+ std::vector<int64_t> ::const_iterator _iter659;
+ for (_iter659 = this->fileIds.begin(); _iter659 != this->fileIds.end(); ++_iter659)
      {
- xfer += oprot->writeI64((*_iter660));
+ xfer += oprot->writeI64((*_iter659));
      }
      xfer += oprot->writeListEnd();
    }
@@ -14843,10 +14811,10 @@ uint32_t PutFileMetadataRequest::write(::apache::thrift::protocol::TProtocol* op
    xfer += oprot->writeFieldBegin("metadata", ::apache::thrift::protocol::T_LIST, 2);
    {
      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->metadata.size()));
- std::vector<std::string> ::const_iterator _iter661;
- for (_iter661 = this->metadata.begin(); _iter661 != this->metadata.end(); ++_iter661)
+ std::vector<std::string> ::const_iterator _iter660;
+ for (_iter660 = this->metadata.begin(); _iter660 != this->metadata.end(); ++_iter660)
      {
- xfer += oprot->writeBinary((*_iter661));
+ xfer += oprot->writeBinary((*_iter660));
      }
      xfer += oprot->writeListEnd();
    }
@@ -14863,13 +14831,13 @@ void swap(PutFileMetadataRequest &a, PutFileMetadataRequest &b) {
    swap(a.metadata, b.metadata);
  }

-PutFileMetadataRequest::PutFileMetadataRequest(const PutFileMetadataRequest& other662) {
+PutFileMetadataRequest::PutFileMetadataRequest(const PutFileMetadataRequest& other661) {
+ fileIds = other661.fileIds;
+ metadata = other661.metadata;
+}
+PutFileMetadataRequest& PutFileMetadataRequest::operator=(const PutFileMetadataRequest& other662) {
    fileIds = other662.fileIds;
    metadata = other662.metadata;
-}
-PutFileMetadataRequest& PutFileMetadataRequest::operator=(const PutFileMetadataRequest& other663) {
- fileIds = other663.fileIds;
- metadata = other663.metadata;
    return *this;
  }
  void PutFileMetadataRequest::printTo(std::ostream& out) const {
@@ -14929,11 +14897,11 @@ void swap(ClearFileMetadataResult &a, ClearFileMetadataResult &b) {
    (void) b;
  }

-ClearFileMetadataResult::ClearFileMetadataResult(const ClearFileMetadataResult& other664) {
- (void) other664;
+ClearFileMetadataResult::ClearFileMetadataResult(const ClearFileMetadataResult& other663) {
+ (void) other663;
  }
-ClearFileMetadataResult& ClearFileMetadataResult::operator=(const ClearFileMetadataResult& other665) {
- (void) other665;
+ClearFileMetadataResult& ClearFileMetadataResult::operator=(const ClearFileMetadataResult& other664) {
+ (void) other664;
    return *this;
  }
  void ClearFileMetadataResult::printTo(std::ostream& out) const {
@@ -14977,14 +14945,14 @@ uint32_t ClearFileMetadataRequest::read(::apache::thrift::protocol::TProtocol* i
          if (ftype == ::apache::thrift::protocol::T_LIST) {
            {
              this->fileIds.clear();
- uint32_t _size666;
- ::apache::thrift::protocol::TType _etype669;
- xfer += iprot->readListBegin(_etype669, _size666);
- this->fileIds.resize(_size666);
- uint32_t _i670;
- for (_i670 = 0; _i670 < _size666; ++_i670)
+ uint32_t _size665;
+ ::apache::thrift::protocol::TType _etype668;
+ xfer += iprot->readListBegin(_etype668, _size665);
+ this->fileIds.resize(_size665);
+ uint32_t _i669;
+ for (_i669 = 0; _i669 < _size665; ++_i669)
              {
- xfer += iprot->readI64(this->fileIds[_i670]);
+ xfer += iprot->readI64(this->fileIds[_i669]);
              }
              xfer += iprot->readListEnd();
            }
@@ -15015,10 +14983,10 @@ uint32_t ClearFileMetadataRequest::write(::apache::thrift::protocol::TProtocol*
    xfer += oprot->writeFieldBegin("fileIds", ::apache::thrift::protocol::T_LIST, 1);
    {
      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I64, static_cast<uint32_t>(this->fileIds.size()));
- std::vector<int64_t> ::const_iterator _iter671;
- for (_iter671 = this->fileIds.begin(); _iter671 != this->fileIds.end(); ++_iter671)
+ std::vector<int64_t> ::const_iterator _iter670;
+ for (_iter670 = this->fileIds.begin(); _iter670 != this->fileIds.end(); ++_iter670)
      {
- xfer += oprot->writeI64((*_iter671));
+ xfer += oprot->writeI64((*_iter670));
      }
      xfer += oprot->writeListEnd();
    }
@@ -15034,11 +15002,11 @@ void swap(ClearFileMetadataRequest &a, ClearFileMetadataRequest &b) {
    swap(a.fileIds, b.fileIds);
  }

-ClearFileMetadataRequest::ClearFileMetadataRequest(const ClearFileMetadataRequest& other672) {
- fileIds = other672.fileIds;
+ClearFileMetadataRequest::ClearFileMetadataRequest(const ClearFileMetadataRequest& other671) {
+ fileIds = other671.fileIds;
  }
-ClearFileMetadataRequest& ClearFileMetadataRequest::operator=(const ClearFileMetadataRequest& other673) {
- fileIds = other673.fileIds;
+ClearFileMetadataRequest& ClearFileMetadataRequest::operator=(const ClearFileMetadataRequest& other672) {
+ fileIds = other672.fileIds;
    return *this;
  }
  void ClearFileMetadataRequest::printTo(std::ostream& out) const {
@@ -15083,14 +15051,14 @@ uint32_t GetAllFunctionsResponse::read(::apache::thrift::protocol::TProtocol* ip
          if (ftype == ::apache::thrift::protocol::T_LIST) {
            {
              this->functions.clear();
- uint32_t _size674;
- ::apache::thrift::protocol::TType _etype677;
- xfer += iprot->readListBegin(_etype677, _size674);
- this->functions.resize(_size674);
- uint32_t _i678;
- for (_i678 = 0; _i678 < _size674; ++_i678)
+ uint32_t _size673;
+ ::apache::thrift::protocol::TType _etype676;
+ xfer += iprot->readListBegin(_etype676, _size673);
+ this->functions.resize(_size673);
+ uint32_t _i677;
+ for (_i677 = 0; _i677 < _size673; ++_i677)
              {
- xfer += this->functions[_i678].read(iprot);
+ xfer += this->functions[_i677].read(iprot);
              }
              xfer += iprot->readListEnd();
            }
@@ -15120,10 +15088,10 @@ uint32_t GetAllFunctionsResponse::write(::apache::thrift::protocol::TProtocol* o
      xfer += oprot->writeFieldBegin("functions", ::apache::thrift::protocol::T_LIST, 1);
      {
        xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->functions.size()));
- std::vector<Function> ::const_iterator _iter679;
- for (_iter679 = this->functions.begin(); _iter679 != this->functions.end(); ++_iter679)
+ std::vector<Function> ::const_iterator _iter678;
+ for (_iter678 = this->functions.begin(); _iter678 != this->functions.end(); ++_iter678)
        {
- xfer += (*_iter679).write(oprot);
+ xfer += (*_iter678).write(oprot);
        }
        xfer += oprot->writeListEnd();
      }
@@ -15140,13 +15108,13 @@ void swap(GetAllFunctionsResponse &a, GetAllFunctionsResponse &b) {
    swap(a.__isset, b.__isset);
  }

-GetAllFunctionsResponse::GetAllFunctionsResponse(const GetAllFunctionsResponse& other680) {
+GetAllFunctionsResponse::GetAllFunctionsResponse(const GetAllFunctionsResponse& other679) {
+ functions = other679.functions;
+ __isset = other679.__isset;
+}
+GetAllFunctionsResponse& GetAllFunctionsResponse::operator=(const GetAllFunctionsResponse& other680) {
    functions = other680.functions;
    __isset = other680.__isset;
-}
-GetAllFunctionsResponse& GetAllFunctionsResponse::operator=(const GetAllFunctionsResponse& other681) {
- functions = other681.functions;
- __isset = other681.__isset;
    return *this;
  }
  void GetAllFunctionsResponse::printTo(std::ostream& out) const {
@@ -15226,13 +15194,13 @@ void swap(MetaException &a, MetaException &b) {
    swap(a.__isset, b.__isset);
  }

-MetaException::MetaException(const MetaException& other682) : TException() {
+MetaException::MetaException(const MetaException& other681) : TException() {
+ message = other681.message;
+ __isset = other681.__isset;
+}
+MetaException& MetaException::operator=(const MetaException& other682) {
    message = other682.message;
    __isset = other682.__isset;
-}
-MetaException& MetaException::operator=(const MetaException& other683) {
- message = other683.message;
- __isset = other683.__isset;
    return *this;
  }
  void MetaException::printTo(std::ostream& out) const {
@@ -15323,13 +15291,13 @@ void swap(UnknownTableException &a, UnknownTableException &b) {
    swap(a.__isset, b.__isset);
  }

-UnknownTableException::UnknownTableException(const UnknownTableException& other684) : TException() {
+UnknownTableException::UnknownTableException(const UnknownTableException& other683) : TException() {
+ message = other683.message;
+ __isset = other683.__isset;
+}
+UnknownTableException& UnknownTableException::operator=(const UnknownTableException& other684) {
    message = other684.message;
    __isset = other684.__isset;
-}
-UnknownTableException& UnknownTableException::operator=(const UnknownTableException& other685) {
- message = other685.message;
- __isset = other685.__isset;
    return *this;
  }
  void UnknownTableException::printTo(std::ostream& out) const {
@@ -15420,13 +15388,13 @@ void swap(UnknownDBException &a, UnknownDBException &b) {
    swap(a.__isset, b.__isset);
  }

-UnknownDBException::UnknownDBException(const UnknownDBException& other686) : TException() {
+UnknownDBException::UnknownDBException(const UnknownDBException& other685) : TException() {
+ message = other685.message;
+ __isset = other685.__isset;
+}
+UnknownDBException& UnknownDBException::operator=(const UnknownDBException& other686) {
    message = other686.message;
    __isset = other686.__isset;
-}
-UnknownDBException& UnknownDBException::operator=(const UnknownDBException& other687) {
- message = other687.message;
- __isset = other687.__isset;
    return *this;
  }
  void UnknownDBException::printTo(std::ostream& out) const {
@@ -15517,13 +15485,13 @@ void swap(AlreadyExistsException &a, AlreadyExistsException &b) {
    swap(a.__isset, b.__isset);
  }

-AlreadyExistsException::AlreadyExistsException(const AlreadyExistsException& other688) : TException() {
+AlreadyExistsException::AlreadyExistsException(const AlreadyExistsException& other687) : TException() {
+ message = other687.message;
+ __isset = other687.__isset;
+}
+AlreadyExistsException& AlreadyExistsException::operator=(const AlreadyExistsException& other688) {
    message = other688.message;
    __isset = other688.__isset;
-}
-AlreadyExistsException& AlreadyExistsException::operator=(const AlreadyExistsException& other689) {
- message = other689.message;
- __isset = other689.__isset;
    return *this;
  }
  void AlreadyExistsException::printTo(std::ostream& out) const {
@@ -15614,13 +15582,13 @@ void swap(InvalidPartitionException &a, InvalidPartitionException &b) {
    swap(a.__isset, b.__isset);
  }

-InvalidPartitionException::InvalidPartitionException(const InvalidPartitionException& other690) : TException() {
+InvalidPartitionException::InvalidPartitionException(const InvalidPartitionException& other689) : TException() {
+ message = other689.message;
+ __isset = other689.__isset;
+}
+InvalidPartitionException& InvalidPartitionException::operator=(const InvalidPartitionException& other690) {
    message = other690.message;
    __isset = other690.__isset;
-}
-InvalidPartitionException& InvalidPartitionException::operator=(const InvalidPartitionException& other691) {
- message = other691.message;
- __isset = other691.__isset;
    return *this;
  }
  void InvalidPartitionException::printTo(std::ostream& out) const {
@@ -15711,13 +15679,13 @@ void swap(UnknownPartitionException &a, UnknownPartitionException &b) {
    swap(a.__isset, b.__isset);
  }

-UnknownPartitionException::UnknownPartitionException(const UnknownPartitionException& other692) : TException() {
+UnknownPartitionException::UnknownPartitionException(const UnknownPartitionException& other691) : TException() {
+ message = other691.message;
+ __isset = other691.__isset;
+}
+UnknownPartitionException& UnknownPartitionException::operator=(const UnknownPartitionException& other692) {
    message = other692.message;
    __isset = other692.__isset;
-}
-UnknownPartitionException& UnknownPartitionException::operator=(const UnknownPartitionException& other693) {
- message = other693.message;
- __isset = other693.__isset;
    return *this;
  }
  void UnknownPartitionException::printTo(std::ostream& out) const {
@@ -15808,13 +15776,13 @@ void swap(InvalidObjectException &a, InvalidObjectException &b) {
    swap(a.__isset, b.__isset);
  }

-InvalidObjectException::InvalidObjectException(const InvalidObjectException& other694) : TException() {
+InvalidObjectException::InvalidObjectException(const InvalidObjectException& other693) : TException() {
+ message = other693.message;
+ __isset = other693.__isset;
+}
+InvalidObjectException& InvalidObjectException::operator=(const InvalidObjectException& other694) {
    message = other694.message;
    __isset = other694.__isset;
-}
-InvalidObjectException& InvalidObjectException::operator=(const InvalidObjectException& other695) {
- message = other695.message;
- __isset = other695.__isset;
    return *this;
  }
  void InvalidObjectException::printTo(std::ostream& out) const {
@@ -15905,13 +15873,13 @@ void swap(NoSuchObjectException &a, NoSuchObjectException &b) {
    swap(a.__isset, b.__isset);
  }

-NoSuchObjectException::NoSuchObjectException(const NoSuchObjectException& other696) : TException() {
+NoSuchObjectException::NoSuchObjectException(const NoSuchObjectException& other695) : TException() {
+ message = other695.message;
+ __isset = other695.__isset;
+}
+NoSuchObjectException& NoSuchObjectException::operator=(const NoSuchObjectException& other696) {
    message = other696.message;
    __isset = other696.__isset;
-}
-NoSuchObjectException& NoSuchObjectException::operator=(const NoSuchObjectException& other697) {
- message = other697.message;
- __isset = other697.__isset;
    return *this;
  }
  void NoSuchObjectException::printTo(std::ostream& out) const {
@@ -16002,13 +15970,13 @@ void swap(IndexAlreadyExistsException &a, IndexAlreadyExistsException &b) {
    swap(a.__isset, b.__isset);
  }

-IndexAlreadyExistsException::IndexAlreadyExistsException(const IndexAlreadyExistsException& other698) : TException() {
+IndexAlreadyExistsException::IndexAlreadyExistsException(const IndexAlreadyExistsException& other697) : TException() {
+ message = other697.message;
+ __isset = other697.__isset;
+}
+IndexAlreadyExistsException& IndexAlreadyExistsException::operator=(const IndexAlreadyExistsException& other698) {
    message = other698.message;
    __isset = other698.__isset;
-}
-IndexAlreadyExistsException& IndexAlreadyExistsException::operator=(const IndexAlreadyExistsException& other699) {
- message = other699.message;
- __isset = other699.__isset;
    return *this;
  }
  void IndexAlreadyExistsException::printTo(std::ostream& out) const {
@@ -16099,13 +16067,13 @@ void swap(InvalidOperationException &a, InvalidOperationException &b) {
    swap(a.__isset, b.__isset);
  }

-InvalidOperationException::InvalidOperationException(const InvalidOperationException& other700) : TException() {
+InvalidOperationException::InvalidOperationException(const InvalidOperationException& other699) : TException() {
+ message = other699.message;
+ __isset = other699.__isset;
+}
+InvalidOperationException& InvalidOperationException::operator=(const InvalidOperationException& other700) {
    message = other700.message;
    __isset = other700.__isset;
-}
-InvalidOperationException& InvalidOperationException::operator=(const InvalidOperationException& other701) {
- message = other701.message;
- __isset = other701.__isset;
    return *this;
  }
  void InvalidOperationException::printTo(std::ostream& out) const {
@@ -16196,13 +16164,13 @@ void swap(ConfigValSecurityException &a, ConfigValSecurityException &b) {
    swap(a.__isset, b.__isset);
  }

-ConfigValSecurityException::ConfigValSecurityException(const ConfigValSecurityException& other702) : TException() {
+ConfigValSecurityException::ConfigValSecurityException(const ConfigValSecurityException& other701) : TException() {
+ message = other701.message;
+ __isset = other701.__isset;
+}
+ConfigValSecurityException& ConfigValSecurityException::operator=(const ConfigValSecurityException& other702) {
    message = other702.message;
    __isset = other702.__isset;
-}
-ConfigValSecurityException& ConfigValSecurityException::operator=(const ConfigValSecurityException& other703) {
- message = other703.message;
- __isset = other703.__isset;
    return *this;
  }
  void ConfigValSecurityException::printTo(std::ostream& out) const {
@@ -16293,13 +16261,13 @@ void swap(InvalidInputException &a, InvalidInputException &b) {
    swap(a.__isset, b.__isset);
  }

-InvalidInputException::InvalidInputException(const InvalidInputException& other704) : TException() {
+InvalidInputException::InvalidInputException(const InvalidInputException& other703) : TException() {
+ message = other703.message;
+ __isset = other703.__isset;
+}
+InvalidInputException& InvalidInputException::operator=(const InvalidInputException& other704) {
    message = other704.message;
    __isset = other704.__isset;
-}
-InvalidInputException& InvalidInputException::operator=(const InvalidInputException& other705) {
- message = other705.message;
- __isset = other705.__isset;
    return *this;
  }
  void InvalidInputException::printTo(std::ostream& out) const {
@@ -16390,13 +16358,13 @@ void swap(NoSuchTxnException &a, NoSuchTxnException &b) {
    swap(a.__isset, b.__isset);
  }

-NoSuchTxnException::NoSuchTxnException(const NoSuchTxnException& other706) : TException() {
+NoSuchTxnException::NoSuchTxnException(const NoSuchTxnException& other705) : TException() {
+ message = other705.message;
+ __isset = other705.__isset;
+}
+NoSuchTxnException& NoSuchTxnException::operator=(const NoSuchTxnException& other706) {
    message = other706.message;
    __isset = other706.__isset;
-}
-NoSuchTxnException& NoSuchTxnException::operator=(const NoSuchTxnException& other707) {
- message = other707.message;
- __isset = other707.__isset;
    return *this;
  }
  void NoSuchTxnException::printTo(std::ostream& out) const {
@@ -16487,13 +16455,13 @@ void swap(TxnAbortedException &a, TxnAbortedException &b) {
    swap(a.__isset, b.__isset);
  }

-TxnAbortedException::TxnAbortedException(const TxnAbortedException& other708) : TException() {
+TxnAbortedException::TxnAbortedException(const TxnAbortedException& other707) : TException() {
+ message = other707.message;
+ __isset = other707.__isset;
+}
+TxnAbortedException& TxnAbortedException::operator=(const TxnAbortedException& other708) {
    message = other708.message;
    __isset = other708.__isset;
-}
-TxnAbortedException& TxnAbortedException::operator=(const TxnAbortedException& other709) {
- message = other709.message;
- __isset = other709.__isset;
    return *this;
  }
  void TxnAbortedException::printTo(std::ostream& out) const {
@@ -16584,13 +16552,13 @@ void swap(TxnOpenException &a, TxnOpenException &b) {
    swap(a.__isset, b.__isset);
  }

-TxnOpenException::TxnOpenException(const TxnOpenException& other710) : TException() {
+TxnOpenException::TxnOpenException(const TxnOpenException& other709) : TException() {
+ message = other709.message;
+ __isset = other709.__isset;
+}
+TxnOpenException& TxnOpenException::operator=(const TxnOpenException& other710) {
    message = other710.message;
    __isset = other710.__isset;
-}
-TxnOpenException& TxnOpenException::operator=(const TxnOpenException& other711) {
- message = other711.message;
- __isset = other711.__isset;
    return *this;
  }
  void TxnOpenException::printTo(std::ostream& out) const {
@@ -16681,13 +16649,13 @@ void swap(NoSuchLockException &a, NoSuchLockException &b) {
    swap(a.__isset, b.__isset);
  }

-NoSuchLockException::NoSuchLockException(const NoSuchLockException& other712) : TException() {
+NoSuchLockException::NoSuchLockException(const NoSuchLockException& other711) : TException() {
+ message = other711.message;
+ __isset = other711.__isset;
+}
+NoSuchLockException& NoSuchLockException::operator=(const NoSuchLockException& other712) {
    message = other712.message;
    __isset = other712.__isset;
-}
-NoSuchLockException& NoSuchLockException::operator=(const NoSuchLockException& other713) {
- message = other713.message;
- __isset = other713.__isset;
    return *this;
  }
  void NoSuchLockException::printTo(std::ostream& out) const {

http://git-wip-us.apache.org/repos/asf/hive/blob/3e0d87f8/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h b/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
index 53ab272..c20badd 100644
--- a/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
+++ b/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
@@ -137,14 +137,6 @@ struct ResourceType {

  extern const std::map<int, const char*> _ResourceType_VALUES_TO_NAMES;

-struct FileMetadataExprType {
- enum type {
- ORC_SARG = 1
- };
-};
-
-extern const std::map<int, const char*> _FileMetadataExprType_VALUES_TO_NAMES;
-
  class Version;

  class FieldSchema;
@@ -5805,9 +5797,8 @@ inline std::ostream& operator<<(std::ostream& out, const GetFileMetadataByExprRe
  }

  typedef struct _GetFileMetadataByExprRequest__isset {
- _GetFileMetadataByExprRequest__isset() : doGetFooters(false), type(false) {}
+ _GetFileMetadataByExprRequest__isset() : doGetFooters(false) {}
    bool doGetFooters :1;
- bool type :1;
  } _GetFileMetadataByExprRequest__isset;

  class GetFileMetadataByExprRequest {
@@ -5815,14 +5806,13 @@ class GetFileMetadataByExprRequest {

    GetFileMetadataByExprRequest(const GetFileMetadataByExprRequest&);
    GetFileMetadataByExprRequest& operator=(const GetFileMetadataByExprRequest&);
- GetFileMetadataByExprRequest() : expr(), doGetFooters(0), type((FileMetadataExprType::type)0) {
+ GetFileMetadataByExprRequest() : expr(), doGetFooters(0) {
    }

    virtual ~GetFileMetadataByExprRequest() throw();
    std::vector<int64_t> fileIds;
    std::string expr;
    bool doGetFooters;
- FileMetadataExprType::type type;

    _GetFileMetadataByExprRequest__isset __isset;

@@ -5832,8 +5822,6 @@ class GetFileMetadataByExprRequest {

    void __set_doGetFooters(const bool val);

- void __set_type(const FileMetadataExprType::type val);
-
    bool operator == (const GetFileMetadataByExprRequest & rhs) const
    {
      if (!(fileIds == rhs.fileIds))
@@ -5844,10 +5832,6 @@ class GetFileMetadataByExprRequest {
        return false;
      else if (__isset.doGetFooters && !(doGetFooters == rhs.doGetFooters))
        return false;
- if (__isset.type != rhs.__isset.type)
- return false;
- else if (__isset.type && !(type == rhs.type))
- return false;
      return true;
    }
    bool operator != (const GetFileMetadataByExprRequest &rhs) const {

http://git-wip-us.apache.org/repos/asf/hive/blob/3e0d87f8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FileMetadataExprType.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FileMetadataExprType.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FileMetadataExprType.java
deleted file mode 100644
index 4e393e2..0000000
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FileMetadataExprType.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.3)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- * @generated
- */
-package org.apache.hadoop.hive.metastore.api;
-
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
-public enum FileMetadataExprType implements org.apache.thrift.TEnum {
- ORC_SARG(1);
-
- private final int value;
-
- private FileMetadataExprType(int value) {
- this.value = value;
- }
-
- /**
- * Get the integer value of this enum value, as defined in the Thrift IDL.
- */
- public int getValue() {
- return value;
- }
-
- /**
- * Find a the enum type by its integer value, as defined in the Thrift IDL.
- * @return null if the value is not found.
- */
- public static FileMetadataExprType findByValue(int value) {
- switch (value) {
- case 1:
- return ORC_SARG;
- default:
- return null;
- }
- }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/3e0d87f8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprRequest.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprRequest.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprRequest.java
index 0236b4a..b880093 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprRequest.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprRequest.java
@@ -41,7 +41,6 @@ public class GetFileMetadataByExprRequest implements org.apache.thrift.TBase<Get
    private static final org.apache.thrift.protocol.TField FILE_IDS_FIELD_DESC = new org.apache.thrift.protocol.TField("fileIds", org.apache.thrift.protocol.TType.LIST, (short)1);
    private static final org.apache.thrift.protocol.TField EXPR_FIELD_DESC = new org.apache.thrift.protocol.TField("expr", org.apache.thrift.protocol.TType.STRING, (short)2);
    private static final org.apache.thrift.protocol.TField DO_GET_FOOTERS_FIELD_DESC = new org.apache.thrift.protocol.TField("doGetFooters", org.apache.thrift.protocol.TType.BOOL, (short)3);
- private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, (short)4);

    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
    static {
@@ -52,18 +51,12 @@ public class GetFileMetadataByExprRequest implements org.apache.thrift.TBase<Get
    private List<Long> fileIds; // required
    private ByteBuffer expr; // required
    private boolean doGetFooters; // optional
- private FileMetadataExprType type; // optional

    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
      FILE_IDS((short)1, "fileIds"),
      EXPR((short)2, "expr"),
- DO_GET_FOOTERS((short)3, "doGetFooters"),
- /**
- *
- * @see FileMetadataExprType
- */
- TYPE((short)4, "type");
+ DO_GET_FOOTERS((short)3, "doGetFooters");

      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();

@@ -84,8 +77,6 @@ public class GetFileMetadataByExprRequest implements org.apache.thrift.TBase<Get
            return EXPR;
          case 3: // DO_GET_FOOTERS
            return DO_GET_FOOTERS;
- case 4: // TYPE
- return TYPE;
          default:
            return null;
        }
@@ -128,7 +119,7 @@ public class GetFileMetadataByExprRequest implements org.apache.thrift.TBase<Get
    // isset id assignments
    private static final int __DOGETFOOTERS_ISSET_ID = 0;
    private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.DO_GET_FOOTERS,_Fields.TYPE};
+ private static final _Fields optionals[] = {_Fields.DO_GET_FOOTERS};
    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
    static {
      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -139,8 +130,6 @@ public class GetFileMetadataByExprRequest implements org.apache.thrift.TBase<Get
          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true)));
      tmpMap.put(_Fields.DO_GET_FOOTERS, new org.apache.thrift.meta_data.FieldMetaData("doGetFooters", org.apache.thrift.TFieldRequirementType.OPTIONAL,
          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
- tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, FileMetadataExprType.class)));
      metaDataMap = Collections.unmodifiableMap(tmpMap);
      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GetFileMetadataByExprRequest.class, metaDataMap);
    }
@@ -170,9 +159,6 @@ public class GetFileMetadataByExprRequest implements org.apache.thrift.TBase<Get
        this.expr = org.apache.thrift.TBaseHelper.copyBinary(other.expr);
      }
      this.doGetFooters = other.doGetFooters;
- if (other.isSetType()) {
- this.type = other.type;
- }
    }

    public GetFileMetadataByExprRequest deepCopy() {
@@ -185,7 +171,6 @@ public class GetFileMetadataByExprRequest implements org.apache.thrift.TBase<Get
      this.expr = null;
      setDoGetFootersIsSet(false);
      this.doGetFooters = false;
- this.type = null;
    }

    public int getFileIdsSize() {
@@ -280,37 +265,6 @@ public class GetFileMetadataByExprRequest implements org.apache.thrift.TBase<Get
      __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __DOGETFOOTERS_ISSET_ID, value);
    }

- /**
- *
- * @see FileMetadataExprType
- */
- public FileMetadataExprType getType() {
- return this.type;
- }
-
- /**
- *
- * @see FileMetadataExprType
- */
- public void setType(FileMetadataExprType type) {
- this.type = type;
- }
-
- public void unsetType() {
- this.type = null;
- }
-
- /** Returns true if field type is set (has been assigned a value) and false otherwise */
- public boolean isSetType() {
- return this.type != null;
- }
-
- public void setTypeIsSet(boolean value) {
- if (!value) {
- this.type = null;
- }
- }
-
    public void setFieldValue(_Fields field, Object value) {
      switch (field) {
      case FILE_IDS:
@@ -337,14 +291,6 @@ public class GetFileMetadataByExprRequest implements org.apache.thrift.TBase<Get
        }
        break;

- case TYPE:
- if (value == null) {
- unsetType();
- } else {
- setType((FileMetadataExprType)value);
- }
- break;
-
      }
    }

@@ -359,9 +305,6 @@ public class GetFileMetadataByExprRequest implements org.apache.thrift.TBase<Get
      case DO_GET_FOOTERS:
        return isDoGetFooters();

- case TYPE:
- return getType();
-
      }
      throw new IllegalStateException();
    }
@@ -379,8 +322,6 @@ public class GetFileMetadataByExprRequest implements org.apache.thrift.TBase<Get
        return isSetExpr();
      case DO_GET_FOOTERS:
        return isSetDoGetFooters();
- case TYPE:
- return isSetType();
      }
      throw new IllegalStateException();
    }
@@ -425,15 +366,6 @@ public class GetFileMetadataByExprRequest implements org.apache.thrift.TBase<Get
          return false;
      }

- boolean this_present_type = true && this.isSetType();
- boolean that_present_type = true && that.isSetType();
- if (this_present_type || that_present_type) {
- if (!(this_present_type && that_present_type))
- return false;
- if (!this.type.equals(that.type))
- return false;
- }
-
      return true;
    }

@@ -456,11 +388,6 @@ public class GetFileMetadataByExprRequest implements org.apache.thrift.TBase<Get
      if (present_doGetFooters)
        list.add(doGetFooters);

- boolean present_type = true && (isSetType());
- list.add(present_type);
- if (present_type)
- list.add(type.getValue());
-
      return list.hashCode();
    }

@@ -502,16 +429,6 @@ public class GetFileMetadataByExprRequest implements org.apache.thrift.TBase<Get
          return lastComparison;
        }
      }
- lastComparison = Boolean.valueOf(isSetType()).compareTo(other.isSetType());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetType()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, other.type);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
      return 0;
    }

@@ -553,16 +470,6 @@ public class GetFileMetadataByExprRequest implements org.apache.thrift.TBase<Get
        sb.append(this.doGetFooters);
        first = false;
      }
- if (isSetType()) {
- if (!first) sb.append(", ");
- sb.append("type:");
- if (this.type == null) {
- sb.append("null");
- } else {
- sb.append(this.type);
- }
- first = false;
- }
      sb.append(")");
      return sb.toString();
    }
@@ -650,14 +557,6 @@ public class GetFileMetadataByExprRequest implements org.apache.thrift.TBase<Get
                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
              }
              break;
- case 4: // TYPE
- if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.type = org.apache.hadoop.hive.metastore.api.FileMetadataExprType.findByValue(iprot.readI32());
- struct.setTypeIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
            default:
              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
          }
@@ -693,13 +592,6 @@ public class GetFileMetadataByExprRequest implements org.apache.thrift.TBase<Get
          oprot.writeBool(struct.doGetFooters);
          oprot.writeFieldEnd();
        }
- if (struct.type != null) {
- if (struct.isSetType()) {
- oprot.writeFieldBegin(TYPE_FIELD_DESC);
- oprot.writeI32(struct.type.getValue());
- oprot.writeFieldEnd();
- }
- }
        oprot.writeFieldStop();
        oprot.writeStructEnd();
      }
@@ -729,16 +621,10 @@ public class GetFileMetadataByExprRequest implements org.apache.thrift.TBase<Get
        if (struct.isSetDoGetFooters()) {
          optionals.set(0);
        }
- if (struct.isSetType()) {
- optionals.set(1);
- }
- oprot.writeBitSet(optionals, 2);
+ oprot.writeBitSet(optionals, 1);
        if (struct.isSetDoGetFooters()) {
          oprot.writeBool(struct.doGetFooters);
        }
- if (struct.isSetType()) {
- oprot.writeI32(struct.type.getValue());
- }
      }

      @Override
@@ -757,15 +643,11 @@ public class GetFileMetadataByExprRequest implements org.apache.thrift.TBase<Get
        struct.setFileIdsIsSet(true);
        struct.expr = iprot.readBinary();
        struct.setExprIsSet(true);
- BitSet incoming = iprot.readBitSet(2);
+ BitSet incoming = iprot.readBitSet(1);
        if (incoming.get(0)) {
          struct.doGetFooters = iprot.readBool();
          struct.setDoGetFootersIsSet(true);
        }
- if (incoming.get(1)) {
- struct.type = org.apache.hadoop.hive.metastore.api.FileMetadataExprType.findByValue(iprot.readI32());
- struct.setTypeIsSet(true);
- }
      }
    }


http://git-wip-us.apache.org/repos/asf/hive/blob/3e0d87f8/metastore/src/gen/thrift/gen-php/metastore/Types.php
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-php/metastore/Types.php b/metastore/src/gen/thrift/gen-php/metastore/Types.php
index e63213d..3ec2b1c 100644
--- a/metastore/src/gen/thrift/gen-php/metastore/Types.php
+++ b/metastore/src/gen/thrift/gen-php/metastore/Types.php
@@ -143,13 +143,6 @@ final class ResourceType {
    );
  }

-final class FileMetadataExprType {
- const ORC_SARG = 1;
- static public $__names = array(
- 1 => 'ORC_SARG',
- );
-}
-
  class Version {
    static $_TSPEC;

@@ -14115,10 +14108,6 @@ class GetFileMetadataByExprRequest {
     * @var bool
     */
    public $doGetFooters = null;
- /**
- * @var int
- */
- public $type = null;

    public function __construct($vals=null) {
      if (!isset(self::$_TSPEC)) {
@@ -14139,10 +14128,6 @@ class GetFileMetadataByExprRequest {
            'var' => 'doGetFooters',
            'type' => TType::BOOL,
            ),
- 4 => array(
- 'var' => 'type',
- 'type' => TType::I32,
- ),
          );
      }
      if (is_array($vals)) {
@@ -14155,9 +14140,6 @@ class GetFileMetadataByExprRequest {
        if (isset($vals['doGetFooters'])) {
          $this->doGetFooters = $vals['doGetFooters'];
        }
- if (isset($vals['type'])) {
- $this->type = $vals['type'];
- }
      }
    }

@@ -14211,13 +14193,6 @@ class GetFileMetadataByExprRequest {
              $xfer += $input->skip($ftype);
            }
            break;
- case 4:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->type);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
          default:
            $xfer += $input->skip($ftype);
            break;
@@ -14258,11 +14233,6 @@ class GetFileMetadataByExprRequest {
        $xfer += $output->writeBool($this->doGetFooters);
        $xfer += $output->writeFieldEnd();
      }
- if ($this->type !== null) {
- $xfer += $output->writeFieldBegin('type', TType::I32, 4);
- $xfer += $output->writeI32($this->type);
- $xfer += $output->writeFieldEnd();
- }
      $xfer += $output->writeFieldStop();
      $xfer += $output->writeStructEnd();
      return $xfer;

http://git-wip-us.apache.org/repos/asf/hive/blob/3e0d87f8/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py b/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py
index 8940dff..221d602 100644
--- a/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py
+++ b/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py
@@ -213,17 +213,6 @@ class ResourceType:
      "ARCHIVE": 3,
    }

-class FileMetadataExprType:
- ORC_SARG = 1
-
- _VALUES_TO_NAMES = {
- 1: "ORC_SARG",
- }
-
- _NAMES_TO_VALUES = {
- "ORC_SARG": 1,
- }
-

  class Version:
    """
@@ -9938,7 +9927,6 @@ class GetFileMetadataByExprRequest:
     - fileIds
     - expr
     - doGetFooters
- - type
    """

    thrift_spec = (
@@ -9946,14 +9934,12 @@ class GetFileMetadataByExprRequest:
      (1, TType.LIST, 'fileIds', (TType.I64,None), None, ), # 1
      (2, TType.STRING, 'expr', None, None, ), # 2
      (3, TType.BOOL, 'doGetFooters', None, None, ), # 3
- (4, TType.I32, 'type', None, None, ), # 4
    )

- def __init__(self, fileIds=None, expr=None, doGetFooters=None, type=None,):
+ def __init__(self, fileIds=None, expr=None, doGetFooters=None,):
      self.fileIds = fileIds
      self.expr = expr
      self.doGetFooters = doGetFooters
- self.type = type

    def read(self, iprot):
      if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -9984,11 +9970,6 @@ class GetFileMetadataByExprRequest:
            self.doGetFooters = iprot.readBool()
          else:
            iprot.skip(ftype)
- elif fid == 4:
- if ftype == TType.I32:
- self.type = iprot.readI32()
- else:
- iprot.skip(ftype)
        else:
          iprot.skip(ftype)
        iprot.readFieldEnd()
@@ -10014,10 +9995,6 @@ class GetFileMetadataByExprRequest:
        oprot.writeFieldBegin('doGetFooters', TType.BOOL, 3)
        oprot.writeBool(self.doGetFooters)
        oprot.writeFieldEnd()
- if self.type is not None:
- oprot.writeFieldBegin('type', TType.I32, 4)
- oprot.writeI32(self.type)
- oprot.writeFieldEnd()
      oprot.writeFieldStop()
      oprot.writeStructEnd()

@@ -10034,7 +10011,6 @@ class GetFileMetadataByExprRequest:
      value = (value * 31) ^ hash(self.fileIds)
      value = (value * 31) ^ hash(self.expr)
      value = (value * 31) ^ hash(self.doGetFooters)
- value = (value * 31) ^ hash(self.type)
      return value

    def __repr__(self):

http://git-wip-us.apache.org/repos/asf/hive/blob/3e0d87f8/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb b/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb
index 08b9b06..cfabbb8 100644
--- a/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb
+++ b/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb
@@ -101,12 +101,6 @@ module ResourceType
    VALID_VALUES = Set.new([JAR, FILE, ARCHIVE]).freeze
  end

-module FileMetadataExprType
- ORC_SARG = 1
- VALUE_MAP = {1 => "ORC_SARG"}
- VALID_VALUES = Set.new([ORC_SARG]).freeze
-end
-
  class Version
    include ::Thrift::Struct, ::Thrift::Struct_Union
    VERSION = 1
@@ -2280,13 +2274,11 @@ class GetFileMetadataByExprRequest
    FILEIDS = 1
    EXPR = 2
    DOGETFOOTERS = 3
- TYPE = 4

    FIELDS = {
      FILEIDS => {:type => ::Thrift::Types::LIST, :name => 'fileIds', :element => {:type => ::Thrift::Types::I64}},
      EXPR => {:type => ::Thrift::Types::STRING, :name => 'expr', :binary => true},
- DOGETFOOTERS => {:type => ::Thrift::Types::BOOL, :name => 'doGetFooters', :optional => true},
- TYPE => {:type => ::Thrift::Types::I32, :name => 'type', :optional => true, :enum_class => ::FileMetadataExprType}
+ DOGETFOOTERS => {:type => ::Thrift::Types::BOOL, :name => 'doGetFooters', :optional => true}
    }

    def struct_fields; FIELDS; end
@@ -2294,9 +2286,6 @@ class GetFileMetadataByExprRequest
    def validate
      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field fileIds is unset!') unless @fileIds
      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field expr is unset!') unless @expr
- unless @type.nil? || ::FileMetadataExprType::VALID_VALUES.include?(@type)
- raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field type!')
- end
    end

    ::Thrift::Struct.generate_accessors self

http://git-wip-us.apache.org/repos/asf/hive/blob/3e0d87f8/metastore/src/java/org/apache/hadoop/hive/metastore/FileMetadataHandler.java
----------------------------------------------------------------------
diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/FileMetadataHandler.java b/metastore/src/java/org/apache/hadoop/hive/metastore/FileMetadataHandler.java
deleted file mode 100644
index 7c3525a..0000000
--- a/metastore/src/java/org/apache/hadoop/hive/metastore/FileMetadataHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * 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;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.List;
-
-public interface FileMetadataHandler {
-
- void getFileMetadataByExpr(List<Long> fileIds, byte[] expr,
- ByteBuffer[] metadatas, ByteBuffer[] results, boolean[] eliminated) throws IOException;
-
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/3e0d87f8/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
----------------------------------------------------------------------
diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java b/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
index 8ed4310..40e6e62 100644
--- a/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
+++ b/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
@@ -5617,16 +5617,13 @@ public class HiveMetaStore extends ThriftHiveMetastore {
          return result;
        }
        result.setIsSupported(true);
-
        List<Long> fileIds = req.getFileIds();
- boolean needMetadata = !req.isSetDoGetFooters() || req.isDoGetFooters();
- FileMetadataExprType type = req.isSetType() ? req.getType() : FileMetadataExprType.ORC_SARG;
-
- ByteBuffer[] metadatas = needMetadata ? new ByteBuffer[fileIds.size()] : null;
- ByteBuffer[] ppdResults = new ByteBuffer[fileIds.size()];
+ byte[] expr = req.getExpr();
+ boolean needMetadata = req.isDoGetFooters();
+ ByteBuffer[] metadatas = new ByteBuffer[fileIds.size()];
+ ByteBuffer[] stripeBitsets = new ByteBuffer[fileIds.size()];
        boolean[] eliminated = new boolean[fileIds.size()];
-
- getMS().getFileMetadataByExpr(fileIds, type, req.getExpr(), metadatas, ppdResults, eliminated);
+ getMS().getFileMetadataByExpr(fileIds, expr, metadatas, stripeBitsets, eliminated);
        for (int i = 0; i < metadatas.length; ++i) {
          long fileId = fileIds.get(i);
          ByteBuffer metadata = metadatas[i];
@@ -5634,7 +5631,7 @@ public class HiveMetaStore extends ThriftHiveMetastore {
          metadata = (eliminated[i] || !needMetadata) ? null
              : handleReadOnlyBufferForThrift(metadata);
          MetadataPpdResult mpr = new MetadataPpdResult();
- ByteBuffer bitset = eliminated[i] ? null : handleReadOnlyBufferForThrift(ppdResults[i]);
+ ByteBuffer bitset = eliminated[i] ? null : handleReadOnlyBufferForThrift(stripeBitsets[i]);
          mpr.setMetadata(metadata);
          mpr.setIncludeBitset(bitset);
          result.putToMetadata(fileId, mpr);

http://git-wip-us.apache.org/repos/asf/hive/blob/3e0d87f8/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
----------------------------------------------------------------------
diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java b/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
index 0f98963..f0c1893 100644
--- a/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
+++ b/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
@@ -79,7 +79,6 @@ import org.apache.hadoop.hive.metastore.api.ColumnStatisticsObj;
  import org.apache.hadoop.hive.metastore.api.CurrentNotificationEventId;
  import org.apache.hadoop.hive.metastore.api.Database;
  import org.apache.hadoop.hive.metastore.api.FieldSchema;
-import org.apache.hadoop.hive.metastore.api.FileMetadataExprType;
  import org.apache.hadoop.hive.metastore.api.Function;
  import org.apache.hadoop.hive.metastore.api.FunctionType;
  import org.apache.hadoop.hive.metastore.api.HiveObjectPrivilege;
@@ -7667,7 +7666,7 @@ public class ObjectStore implements RawStore, Configurable {
    }

    @Override
- public void getFileMetadataByExpr(List<Long> fileIds, FileMetadataExprType type, byte[] expr,
+ public void getFileMetadataByExpr(List<Long> fileIds, byte[] expr,
        ByteBuffer[] metadatas, ByteBuffer[] stripeBitsets, boolean[] eliminated) {
      throw new UnsupportedOperationException();
    }

http://git-wip-us.apache.org/repos/asf/hive/blob/3e0d87f8/metastore/src/java/org/apache/hadoop/hive/metastore/RawStore.java
----------------------------------------------------------------------
diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/RawStore.java b/metastore/src/java/org/apache/hadoop/hive/metastore/RawStore.java
index 4aa17a5..45428ed 100644
--- a/metastore/src/java/org/apache/hadoop/hive/metastore/RawStore.java
+++ b/metastore/src/java/org/apache/hadoop/hive/metastore/RawStore.java
@@ -31,7 +31,6 @@ import org.apache.hadoop.hive.metastore.api.AggrStats;
  import org.apache.hadoop.hive.metastore.api.ColumnStatistics;
  import org.apache.hadoop.hive.metastore.api.CurrentNotificationEventId;
  import org.apache.hadoop.hive.metastore.api.Database;
-import org.apache.hadoop.hive.metastore.api.FileMetadataExprType;
  import org.apache.hadoop.hive.metastore.api.Function;
  import org.apache.hadoop.hive.metastore.api.HiveObjectPrivilege;
  import org.apache.hadoop.hive.metastore.api.Index;
@@ -618,7 +617,6 @@ public interface RawStore extends Configurable {
     * produce additional information based on file metadata and also filter the file list.
     * @param fileIds List of file IDs from the filesystem.
     * @param expr Format-specific serialized expression applicable to the files' metadatas.
- * @param type Expression type; used to determine the class that handles the metadata.
     * @param metadatas Output parameter; fileIds-sized array to receive the metadatas
     * for corresponding files, if any.
     * @param exprResults Output parameter; fileIds-sized array to receive the format-specific
@@ -626,7 +624,7 @@ public interface RawStore extends Configurable {
     * @param eliminated Output parameter; fileIds-sized array to receive the indication of whether
     * the corresponding files are entirely eliminated by the expression.
     */
- void getFileMetadataByExpr(List<Long> fileIds, FileMetadataExprType type, byte[] expr,
- ByteBuffer[] metadatas, ByteBuffer[] exprResults, boolean[] eliminated)
- throws MetaException;
+ void getFileMetadataByExpr(
+ List<Long> fileIds, byte[] expr, ByteBuffer[] metadatas,
+ ByteBuffer[] exprResults, boolean[] eliminated) throws MetaException;
  }

http://git-wip-us.apache.org/repos/asf/hive/blob/3e0d87f8/metastore/src/java/org/apache/hadoop/hive/metastore/filemeta/OrcFileMetadataHandler.java
----------------------------------------------------------------------
diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/filemeta/OrcFileMetadataHandler.java b/metastore/src/java/org/apache/hadoop/hive/metastore/filemeta/OrcFileMetadataHandler.java
deleted file mode 100644
index 14189da..0000000
--- a/metastore/src/java/org/apache/hadoop/hive/metastore/filemeta/OrcFileMetadataHandler.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * 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.filemeta;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.List;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.metastore.FileMetadataHandler;
-import org.apache.hadoop.hive.metastore.PartitionExpressionProxy;
-import org.apache.hadoop.hive.metastore.hbase.HBaseReadWrite;
-import org.apache.hadoop.hive.ql.io.sarg.SearchArgument;
-
-public class OrcFileMetadataHandler implements FileMetadataHandler {
- private final Configuration conf;
- private final PartitionExpressionProxy expressionProxy;
- private final HBaseReadWrite hbase;
-
- public OrcFileMetadataHandler(Configuration conf,
- PartitionExpressionProxy expressionProxy, HBaseReadWrite hbase) {
- this.conf = conf;
- this.expressionProxy = expressionProxy;
- this.hbase = hbase;
- }
-
- @Override
- public void getFileMetadataByExpr(List<Long> fileIds, byte[] expr,
- ByteBuffer[] metadatas, ByteBuffer[] results, boolean[] eliminated) throws IOException {
- SearchArgument sarg = expressionProxy.createSarg(expr);
- // For now, don't push anything into HBase, nor store anything special in HBase
- if (metadatas == null) {
- // null means don't return metadata; we'd need the array anyway for now.
- metadatas = new ByteBuffer[results.length];
- }
- hbase.getFileMetadata(fileIds, metadatas);
- for (int i = 0; i < metadatas.length; ++i) {
- if (metadatas[i] == null) continue;
- ByteBuffer result = expressionProxy.applySargToFileMetadata(sarg, metadatas[i]);
- eliminated[i] = (result == null);
- if (!eliminated[i]) {
- results[i] = result;
- }
- }
- }
-
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/3e0d87f8/metastore/src/java/org/apache/hadoop/hive/metastore/hbase/HBaseReadWrite.java
----------------------------------------------------------------------
diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/hbase/HBaseReadWrite.java b/metastore/src/java/org/apache/hadoop/hive/metastore/hbase/HBaseReadWrite.java
index ffd3ee5..781f562 100644
--- a/metastore/src/java/org/apache/hadoop/hive/metastore/hbase/HBaseReadWrite.java
+++ b/metastore/src/java/org/apache/hadoop/hive/metastore/hbase/HBaseReadWrite.java
@@ -1747,7 +1747,7 @@ public class HBaseReadWrite {
     * @param fileIds file ID list.
     * @return Serialized file metadata.
     */
- public void getFileMetadata(List<Long> fileIds, ByteBuffer[] result) throws IOException {
+ void getFileMetadata(List<Long> fileIds, ByteBuffer[] result) throws IOException {
      byte[][] keys = new byte[fileIds.size()][];
      for (int i = 0; i < fileIds.size(); ++i) {
        keys[i] = HBaseUtils.makeLongKey(fileIds.get(i));

http://git-wip-us.apache.org/repos/asf/hive/blob/3e0d87f8/metastore/src/java/org/apache/hadoop/hive/metastore/hbase/HBaseStore.java
----------------------------------------------------------------------
diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/hbase/HBaseStore.java b/metastore/src/java/org/apache/hadoop/hive/metastore/hbase/HBaseStore.java
index 67a02d9..09e57e5 100644
--- a/metastore/src/java/org/apache/hadoop/hive/metastore/hbase/HBaseStore.java
+++ b/metastore/src/java/org/apache/hadoop/hive/metastore/hbase/HBaseStore.java
@@ -27,7 +27,6 @@ import org.apache.commons.logging.LogFactory;
  import org.apache.hadoop.conf.Configuration;
  import org.apache.hadoop.hive.common.FileUtils;
  import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.hadoop.hive.metastore.FileMetadataHandler;
  import org.apache.hadoop.hive.metastore.HiveMetaStore;
  import org.apache.hadoop.hive.metastore.PartFilterExprUtil;
  import org.apache.hadoop.hive.metastore.PartitionExpressionProxy;
@@ -39,7 +38,6 @@ import org.apache.hadoop.hive.metastore.api.ColumnStatisticsObj;
  import org.apache.hadoop.hive.metastore.api.CurrentNotificationEventId;
  import org.apache.hadoop.hive.metastore.api.Database;
  import org.apache.hadoop.hive.metastore.api.FieldSchema;
-import org.apache.hadoop.hive.metastore.api.FileMetadataExprType;
  import org.apache.hadoop.hive.metastore.api.Function;
  import org.apache.hadoop.hive.metastore.api.HiveObjectPrivilege;
  import org.apache.hadoop.hive.metastore.api.HiveObjectRef;
@@ -66,7 +64,6 @@ import org.apache.hadoop.hive.metastore.api.Type;
  import org.apache.hadoop.hive.metastore.api.UnknownDBException;
  import org.apache.hadoop.hive.metastore.api.UnknownPartitionException;
  import org.apache.hadoop.hive.metastore.api.UnknownTableException;
-import org.apache.hadoop.hive.metastore.filemeta.OrcFileMetadataHandler;
  import org.apache.hadoop.hive.metastore.hbase.HBaseFilterPlanUtil.PlanResult;
  import org.apache.hadoop.hive.metastore.hbase.HBaseFilterPlanUtil.ScanPlan;
  import org.apache.hadoop.hive.metastore.parser.ExpressionTree;
@@ -99,7 +96,6 @@ public class HBaseStore implements RawStore {
    private Configuration conf;
    private int txnNestLevel = 0;
    private PartitionExpressionProxy expressionProxy = null;
- private Map<FileMetadataExprType, FileMetadataHandler> fmHandlers = new HashMap<>();

    public HBaseStore() {
    }
@@ -2245,24 +2241,10 @@ public class HBaseStore implements RawStore {
      // initialize expressionProxy. Also re-initialize it if
      // setConf is being called with new configuration object (though that
      // is not expected to happen, doing it just for safety)
- // TODO: why not re-intialize HBaseReadWrite?
- if (expressionProxy == null || conf != configuration) {
+ if(expressionProxy == null || conf != configuration) {
        expressionProxy = PartFilterExprUtil.createExpressionProxy(configuration);
      }
      conf = configuration;
- createFileMetadataHandlers();
- }
-
- private void createFileMetadataHandlers() {
- for (FileMetadataExprType v : FileMetadataExprType.values()) {
- switch (v) {
- case ORC_SARG:
- fmHandlers.put(v, new OrcFileMetadataHandler(conf, expressionProxy, getHBase()));
- break;
- default:
- throw new AssertionError("Unsupported type " + v);
- }
- }
    }

    @Override
@@ -2398,16 +2380,25 @@ public class HBaseStore implements RawStore {
    }

    @Override
- public void getFileMetadataByExpr(List<Long> fileIds, FileMetadataExprType type, byte[] expr,
- ByteBuffer[] metadatas, ByteBuffer[] results, boolean[] eliminated) throws MetaException {
- FileMetadataHandler fmh = fmHandlers.get(type);
+ public void getFileMetadataByExpr(List<Long> fileIds, byte[] expr, ByteBuffer[] metadatas,
+ ByteBuffer[] results, boolean[] eliminated) throws MetaException {
+ SearchArgument sarg = expressionProxy.createSarg(expr);
      boolean commit = true;
      try {
- fmh.getFileMetadataByExpr(fileIds, expr, metadatas, results, eliminated);
+ // For now, don't push anything into HBase, nor store anything special in HBase
+ getHBase().getFileMetadata(fileIds, metadatas);
+ for (int i = 0; i < metadatas.length; ++i) {
+ if (metadatas[i] == null) continue;
+ ByteBuffer result = expressionProxy.applySargToFileMetadata(sarg, metadatas[i]);
+ eliminated[i] = (result == null);
+ if (!eliminated[i]) {
+ results[i] = result;
+ }
+ }
      } catch (IOException e) {
- LOG.error("Unable to get file metadata by expr", e);
        commit = false;
- throw new MetaException("Error reading file metadata by expr" + e.getMessage());
+ LOG.error("Unable to get file metadata", e);
+ throw new MetaException("Error reading file metadata " + e.getMessage());
      } finally {
        commitOrRoleBack(commit);
      }

http://git-wip-us.apache.org/repos/asf/hive/blob/3e0d87f8/metastore/src/test/org/apache/hadoop/hive/metastore/DummyRawStoreControlledCommit.java
----------------------------------------------------------------------
diff --git a/metastore/src/test/org/apache/hadoop/hive/metastore/DummyRawStoreControlledCommit.java b/metastore/src/test/org/apache/hadoop/hive/metastore/DummyRawStoreControlledCommit.java
index a100e9f..d11c0d5 100644
--- a/metastore/src/test/org/apache/hadoop/hive/metastore/DummyRawStoreControlledCommit.java
+++ b/metastore/src/test/org/apache/hadoop/hive/metastore/DummyRawStoreControlledCommit.java
@@ -30,7 +30,6 @@ import org.apache.hadoop.hive.metastore.api.AggrStats;
  import org.apache.hadoop.hive.metastore.api.ColumnStatistics;
  import org.apache.hadoop.hive.metastore.api.CurrentNotificationEventId;
  import org.apache.hadoop.hive.metastore.api.Database;
-import org.apache.hadoop.hive.metastore.api.FileMetadataExprType;
  import org.apache.hadoop.hive.metastore.api.Function;
  import org.apache.hadoop.hive.metastore.api.HiveObjectPrivilege;
  import org.apache.hadoop.hive.metastore.api.Index;
@@ -778,7 +777,7 @@ public class DummyRawStoreControlledCommit implements RawStore, Configurable {


    @Override
- public void getFileMetadataByExpr(List<Long> fileIds, FileMetadataExprType type, byte[] expr,
+ public void getFileMetadataByExpr(List<Long> fileIds, byte[] expr,
        ByteBuffer[] metadatas, ByteBuffer[] stripeBitsets, boolean[] eliminated) {
    }
  }

http://git-wip-us.apache.org/repos/asf/hive/blob/3e0d87f8/metastore/src/test/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java
----------------------------------------------------------------------
diff --git a/metastore/src/test/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java b/metastore/src/test/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java
index f6100e6..2de049a 100644
--- a/metastore/src/test/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java
+++ b/metastore/src/test/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java
@@ -31,7 +31,6 @@ import org.apache.hadoop.hive.metastore.api.AggrStats;
  import org.apache.hadoop.hive.metastore.api.ColumnStatistics;
  import org.apache.hadoop.hive.metastore.api.CurrentNotificationEventId;
  import org.apache.hadoop.hive.metastore.api.Database;
-import org.apache.hadoop.hive.metastore.api.FileMetadataExprType;
  import org.apache.hadoop.hive.metastore.api.Function;
  import org.apache.hadoop.hive.metastore.api.HiveObjectPrivilege;
  import org.apache.hadoop.hive.metastore.api.Index;
@@ -794,7 +793,7 @@ public class DummyRawStoreForJdoConnection implements RawStore {
    }

    @Override
- public void getFileMetadataByExpr(List<Long> fileIds, FileMetadataExprType type, byte[] expr,
+ public void getFileMetadataByExpr(List<Long> fileIds, byte[] expr,
        ByteBuffer[] metadatas, ByteBuffer[] stripeBitsets, boolean[] eliminated) {
    }
  }

Search Discussions

  • Sershe at Oct 23, 2015 at 11:58 pm
    http://git-wip-us.apache.org/repos/asf/hive/blob/3e0d87f8/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp
    ----------------------------------------------------------------------
    diff --git a/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp b/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp
    index a82c363..44aa22e 100644
    --- a/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp
    +++ b/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp
    @@ -1240,14 +1240,14 @@ uint32_t ThriftHiveMetastore_get_databases_result::read(::apache::thrift::protoc
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->success.clear();
    - uint32_t _size714;
    - ::apache::thrift::protocol::TType _etype717;
    - xfer += iprot->readListBegin(_etype717, _size714);
    - this->success.resize(_size714);
    - uint32_t _i718;
    - for (_i718 = 0; _i718 < _size714; ++_i718)
    + uint32_t _size713;
    + ::apache::thrift::protocol::TType _etype716;
    + xfer += iprot->readListBegin(_etype716, _size713);
    + this->success.resize(_size713);
    + uint32_t _i717;
    + for (_i717 = 0; _i717 < _size713; ++_i717)
                  {
    - xfer += iprot->readString(this->success[_i718]);
    + xfer += iprot->readString(this->success[_i717]);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -1286,10 +1286,10 @@ uint32_t ThriftHiveMetastore_get_databases_result::write(::apache::thrift::proto
          xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
          {
            xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->success.size()));
    - std::vector<std::string> ::const_iterator _iter719;
    - for (_iter719 = this->success.begin(); _iter719 != this->success.end(); ++_iter719)
    + std::vector<std::string> ::const_iterator _iter718;
    + for (_iter718 = this->success.begin(); _iter718 != this->success.end(); ++_iter718)
            {
    - xfer += oprot->writeString((*_iter719));
    + xfer += oprot->writeString((*_iter718));
            }
            xfer += oprot->writeListEnd();
          }
    @@ -1334,14 +1334,14 @@ uint32_t ThriftHiveMetastore_get_databases_presult::read(::apache::thrift::proto
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  (*(this->success)).clear();
    - uint32_t _size720;
    - ::apache::thrift::protocol::TType _etype723;
    - xfer += iprot->readListBegin(_etype723, _size720);
    - (*(this->success)).resize(_size720);
    - uint32_t _i724;
    - for (_i724 = 0; _i724 < _size720; ++_i724)
    + uint32_t _size719;
    + ::apache::thrift::protocol::TType _etype722;
    + xfer += iprot->readListBegin(_etype722, _size719);
    + (*(this->success)).resize(_size719);
    + uint32_t _i723;
    + for (_i723 = 0; _i723 < _size719; ++_i723)
                  {
    - xfer += iprot->readString((*(this->success))[_i724]);
    + xfer += iprot->readString((*(this->success))[_i723]);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -1458,14 +1458,14 @@ uint32_t ThriftHiveMetastore_get_all_databases_result::read(::apache::thrift::pr
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->success.clear();
    - uint32_t _size725;
    - ::apache::thrift::protocol::TType _etype728;
    - xfer += iprot->readListBegin(_etype728, _size725);
    - this->success.resize(_size725);
    - uint32_t _i729;
    - for (_i729 = 0; _i729 < _size725; ++_i729)
    + uint32_t _size724;
    + ::apache::thrift::protocol::TType _etype727;
    + xfer += iprot->readListBegin(_etype727, _size724);
    + this->success.resize(_size724);
    + uint32_t _i728;
    + for (_i728 = 0; _i728 < _size724; ++_i728)
                  {
    - xfer += iprot->readString(this->success[_i729]);
    + xfer += iprot->readString(this->success[_i728]);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -1504,10 +1504,10 @@ uint32_t ThriftHiveMetastore_get_all_databases_result::write(::apache::thrift::p
          xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
          {
            xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->success.size()));
    - std::vector<std::string> ::const_iterator _iter730;
    - for (_iter730 = this->success.begin(); _iter730 != this->success.end(); ++_iter730)
    + std::vector<std::string> ::const_iterator _iter729;
    + for (_iter729 = this->success.begin(); _iter729 != this->success.end(); ++_iter729)
            {
    - xfer += oprot->writeString((*_iter730));
    + xfer += oprot->writeString((*_iter729));
            }
            xfer += oprot->writeListEnd();
          }
    @@ -1552,14 +1552,14 @@ uint32_t ThriftHiveMetastore_get_all_databases_presult::read(::apache::thrift::p
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  (*(this->success)).clear();
    - uint32_t _size731;
    - ::apache::thrift::protocol::TType _etype734;
    - xfer += iprot->readListBegin(_etype734, _size731);
    - (*(this->success)).resize(_size731);
    - uint32_t _i735;
    - for (_i735 = 0; _i735 < _size731; ++_i735)
    + uint32_t _size730;
    + ::apache::thrift::protocol::TType _etype733;
    + xfer += iprot->readListBegin(_etype733, _size730);
    + (*(this->success)).resize(_size730);
    + uint32_t _i734;
    + for (_i734 = 0; _i734 < _size730; ++_i734)
                  {
    - xfer += iprot->readString((*(this->success))[_i735]);
    + xfer += iprot->readString((*(this->success))[_i734]);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -2621,17 +2621,17 @@ uint32_t ThriftHiveMetastore_get_type_all_result::read(::apache::thrift::protoco
              if (ftype == ::apache::thrift::protocol::T_MAP) {
                {
                  this->success.clear();
    - uint32_t _size736;
    - ::apache::thrift::protocol::TType _ktype737;
    - ::apache::thrift::protocol::TType _vtype738;
    - xfer += iprot->readMapBegin(_ktype737, _vtype738, _size736);
    - uint32_t _i740;
    - for (_i740 = 0; _i740 < _size736; ++_i740)
    + uint32_t _size735;
    + ::apache::thrift::protocol::TType _ktype736;
    + ::apache::thrift::protocol::TType _vtype737;
    + xfer += iprot->readMapBegin(_ktype736, _vtype737, _size735);
    + uint32_t _i739;
    + for (_i739 = 0; _i739 < _size735; ++_i739)
                  {
    - std::string _key741;
    - xfer += iprot->readString(_key741);
    - Type& _val742 = this->success[_key741];
    - xfer += _val742.read(iprot);
    + std::string _key740;
    + xfer += iprot->readString(_key740);
    + Type& _val741 = this->success[_key740];
    + xfer += _val741.read(iprot);
                  }
                  xfer += iprot->readMapEnd();
                }
    @@ -2670,11 +2670,11 @@ uint32_t ThriftHiveMetastore_get_type_all_result::write(::apache::thrift::protoc
          xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_MAP, 0);
          {
            xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
    - std::map<std::string, Type> ::const_iterator _iter743;
    - for (_iter743 = this->success.begin(); _iter743 != this->success.end(); ++_iter743)
    + std::map<std::string, Type> ::const_iterator _iter742;
    + for (_iter742 = this->success.begin(); _iter742 != this->success.end(); ++_iter742)
            {
    - xfer += oprot->writeString(_iter743->first);
    - xfer += _iter743->second.write(oprot);
    + xfer += oprot->writeString(_iter742->first);
    + xfer += _iter742->second.write(oprot);
            }
            xfer += oprot->writeMapEnd();
          }
    @@ -2719,17 +2719,17 @@ uint32_t ThriftHiveMetastore_get_type_all_presult::read(::apache::thrift::protoc
              if (ftype == ::apache::thrift::protocol::T_MAP) {
                {
                  (*(this->success)).clear();
    - uint32_t _size744;
    - ::apache::thrift::protocol::TType _ktype745;
    - ::apache::thrift::protocol::TType _vtype746;
    - xfer += iprot->readMapBegin(_ktype745, _vtype746, _size744);
    - uint32_t _i748;
    - for (_i748 = 0; _i748 < _size744; ++_i748)
    + uint32_t _size743;
    + ::apache::thrift::protocol::TType _ktype744;
    + ::apache::thrift::protocol::TType _vtype745;
    + xfer += iprot->readMapBegin(_ktype744, _vtype745, _size743);
    + uint32_t _i747;
    + for (_i747 = 0; _i747 < _size743; ++_i747)
                  {
    - std::string _key749;
    - xfer += iprot->readString(_key749);
    - Type& _val750 = (*(this->success))[_key749];
    - xfer += _val750.read(iprot);
    + std::string _key748;
    + xfer += iprot->readString(_key748);
    + Type& _val749 = (*(this->success))[_key748];
    + xfer += _val749.read(iprot);
                  }
                  xfer += iprot->readMapEnd();
                }
    @@ -2883,14 +2883,14 @@ uint32_t ThriftHiveMetastore_get_fields_result::read(::apache::thrift::protocol:
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->success.clear();
    - uint32_t _size751;
    - ::apache::thrift::protocol::TType _etype754;
    - xfer += iprot->readListBegin(_etype754, _size751);
    - this->success.resize(_size751);
    - uint32_t _i755;
    - for (_i755 = 0; _i755 < _size751; ++_i755)
    + uint32_t _size750;
    + ::apache::thrift::protocol::TType _etype753;
    + xfer += iprot->readListBegin(_etype753, _size750);
    + this->success.resize(_size750);
    + uint32_t _i754;
    + for (_i754 = 0; _i754 < _size750; ++_i754)
                  {
    - xfer += this->success[_i755].read(iprot);
    + xfer += this->success[_i754].read(iprot);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -2945,10 +2945,10 @@ uint32_t ThriftHiveMetastore_get_fields_result::write(::apache::thrift::protocol
          xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
          {
            xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
    - std::vector<FieldSchema> ::const_iterator _iter756;
    - for (_iter756 = this->success.begin(); _iter756 != this->success.end(); ++_iter756)
    + std::vector<FieldSchema> ::const_iterator _iter755;
    + for (_iter755 = this->success.begin(); _iter755 != this->success.end(); ++_iter755)
            {
    - xfer += (*_iter756).write(oprot);
    + xfer += (*_iter755).write(oprot);
            }
            xfer += oprot->writeListEnd();
          }
    @@ -3001,14 +3001,14 @@ uint32_t ThriftHiveMetastore_get_fields_presult::read(::apache::thrift::protocol
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  (*(this->success)).clear();
    - uint32_t _size757;
    - ::apache::thrift::protocol::TType _etype760;
    - xfer += iprot->readListBegin(_etype760, _size757);
    - (*(this->success)).resize(_size757);
    - uint32_t _i761;
    - for (_i761 = 0; _i761 < _size757; ++_i761)
    + uint32_t _size756;
    + ::apache::thrift::protocol::TType _etype759;
    + xfer += iprot->readListBegin(_etype759, _size756);
    + (*(this->success)).resize(_size756);
    + uint32_t _i760;
    + for (_i760 = 0; _i760 < _size756; ++_i760)
                  {
    - xfer += (*(this->success))[_i761].read(iprot);
    + xfer += (*(this->success))[_i760].read(iprot);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -3194,14 +3194,14 @@ uint32_t ThriftHiveMetastore_get_fields_with_environment_context_result::read(::
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->success.clear();
    - uint32_t _size762;
    - ::apache::thrift::protocol::TType _etype765;
    - xfer += iprot->readListBegin(_etype765, _size762);
    - this->success.resize(_size762);
    - uint32_t _i766;
    - for (_i766 = 0; _i766 < _size762; ++_i766)
    + uint32_t _size761;
    + ::apache::thrift::protocol::TType _etype764;
    + xfer += iprot->readListBegin(_etype764, _size761);
    + this->success.resize(_size761);
    + uint32_t _i765;
    + for (_i765 = 0; _i765 < _size761; ++_i765)
                  {
    - xfer += this->success[_i766].read(iprot);
    + xfer += this->success[_i765].read(iprot);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -3256,10 +3256,10 @@ uint32_t ThriftHiveMetastore_get_fields_with_environment_context_result::write(:
          xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
          {
            xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
    - std::vector<FieldSchema> ::const_iterator _iter767;
    - for (_iter767 = this->success.begin(); _iter767 != this->success.end(); ++_iter767)
    + std::vector<FieldSchema> ::const_iterator _iter766;
    + for (_iter766 = this->success.begin(); _iter766 != this->success.end(); ++_iter766)
            {
    - xfer += (*_iter767).write(oprot);
    + xfer += (*_iter766).write(oprot);
            }
            xfer += oprot->writeListEnd();
          }
    @@ -3312,14 +3312,14 @@ uint32_t ThriftHiveMetastore_get_fields_with_environment_context_presult::read(:
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  (*(this->success)).clear();
    - uint32_t _size768;
    - ::apache::thrift::protocol::TType _etype771;
    - xfer += iprot->readListBegin(_etype771, _size768);
    - (*(this->success)).resize(_size768);
    - uint32_t _i772;
    - for (_i772 = 0; _i772 < _size768; ++_i772)
    + uint32_t _size767;
    + ::apache::thrift::protocol::TType _etype770;
    + xfer += iprot->readListBegin(_etype770, _size767);
    + (*(this->success)).resize(_size767);
    + uint32_t _i771;
    + for (_i771 = 0; _i771 < _size767; ++_i771)
                  {
    - xfer += (*(this->success))[_i772].read(iprot);
    + xfer += (*(this->success))[_i771].read(iprot);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -3489,14 +3489,14 @@ uint32_t ThriftHiveMetastore_get_schema_result::read(::apache::thrift::protocol:
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->success.clear();
    - uint32_t _size773;
    - ::apache::thrift::protocol::TType _etype776;
    - xfer += iprot->readListBegin(_etype776, _size773);
    - this->success.resize(_size773);
    - uint32_t _i777;
    - for (_i777 = 0; _i777 < _size773; ++_i777)
    + uint32_t _size772;
    + ::apache::thrift::protocol::TType _etype775;
    + xfer += iprot->readListBegin(_etype775, _size772);
    + this->success.resize(_size772);
    + uint32_t _i776;
    + for (_i776 = 0; _i776 < _size772; ++_i776)
                  {
    - xfer += this->success[_i777].read(iprot);
    + xfer += this->success[_i776].read(iprot);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -3551,10 +3551,10 @@ uint32_t ThriftHiveMetastore_get_schema_result::write(::apache::thrift::protocol
          xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
          {
            xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
    - std::vector<FieldSchema> ::const_iterator _iter778;
    - for (_iter778 = this->success.begin(); _iter778 != this->success.end(); ++_iter778)
    + std::vector<FieldSchema> ::const_iterator _iter777;
    + for (_iter777 = this->success.begin(); _iter777 != this->success.end(); ++_iter777)
            {
    - xfer += (*_iter778).write(oprot);
    + xfer += (*_iter777).write(oprot);
            }
            xfer += oprot->writeListEnd();
          }
    @@ -3607,14 +3607,14 @@ uint32_t ThriftHiveMetastore_get_schema_presult::read(::apache::thrift::protocol
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  (*(this->success)).clear();
    - uint32_t _size779;
    - ::apache::thrift::protocol::TType _etype782;
    - xfer += iprot->readListBegin(_etype782, _size779);
    - (*(this->success)).resize(_size779);
    - uint32_t _i783;
    - for (_i783 = 0; _i783 < _size779; ++_i783)
    + uint32_t _size778;
    + ::apache::thrift::protocol::TType _etype781;
    + xfer += iprot->readListBegin(_etype781, _size778);
    + (*(this->success)).resize(_size778);
    + uint32_t _i782;
    + for (_i782 = 0; _i782 < _size778; ++_i782)
                  {
    - xfer += (*(this->success))[_i783].read(iprot);
    + xfer += (*(this->success))[_i782].read(iprot);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -3800,14 +3800,14 @@ uint32_t ThriftHiveMetastore_get_schema_with_environment_context_result::read(::
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->success.clear();
    - uint32_t _size784;
    - ::apache::thrift::protocol::TType _etype787;
    - xfer += iprot->readListBegin(_etype787, _size784);
    - this->success.resize(_size784);
    - uint32_t _i788;
    - for (_i788 = 0; _i788 < _size784; ++_i788)
    + uint32_t _size783;
    + ::apache::thrift::protocol::TType _etype786;
    + xfer += iprot->readListBegin(_etype786, _size783);
    + this->success.resize(_size783);
    + uint32_t _i787;
    + for (_i787 = 0; _i787 < _size783; ++_i787)
                  {
    - xfer += this->success[_i788].read(iprot);
    + xfer += this->success[_i787].read(iprot);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -3862,10 +3862,10 @@ uint32_t ThriftHiveMetastore_get_schema_with_environment_context_result::write(:
          xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
          {
            xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
    - std::vector<FieldSchema> ::const_iterator _iter789;
    - for (_iter789 = this->success.begin(); _iter789 != this->success.end(); ++_iter789)
    + std::vector<FieldSchema> ::const_iterator _iter788;
    + for (_iter788 = this->success.begin(); _iter788 != this->success.end(); ++_iter788)
            {
    - xfer += (*_iter789).write(oprot);
    + xfer += (*_iter788).write(oprot);
            }
            xfer += oprot->writeListEnd();
          }
    @@ -3918,14 +3918,14 @@ uint32_t ThriftHiveMetastore_get_schema_with_environment_context_presult::read(:
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  (*(this->success)).clear();
    - uint32_t _size790;
    - ::apache::thrift::protocol::TType _etype793;
    - xfer += iprot->readListBegin(_etype793, _size790);
    - (*(this->success)).resize(_size790);
    - uint32_t _i794;
    - for (_i794 = 0; _i794 < _size790; ++_i794)
    + uint32_t _size789;
    + ::apache::thrift::protocol::TType _etype792;
    + xfer += iprot->readListBegin(_etype792, _size789);
    + (*(this->success)).resize(_size789);
    + uint32_t _i793;
    + for (_i793 = 0; _i793 < _size789; ++_i793)
                  {
    - xfer += (*(this->success))[_i794].read(iprot);
    + xfer += (*(this->success))[_i793].read(iprot);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -5099,14 +5099,14 @@ uint32_t ThriftHiveMetastore_get_tables_result::read(::apache::thrift::protocol:
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->success.clear();
    - uint32_t _size795;
    - ::apache::thrift::protocol::TType _etype798;
    - xfer += iprot->readListBegin(_etype798, _size795);
    - this->success.resize(_size795);
    - uint32_t _i799;
    - for (_i799 = 0; _i799 < _size795; ++_i799)
    + uint32_t _size794;
    + ::apache::thrift::protocol::TType _etype797;
    + xfer += iprot->readListBegin(_etype797, _size794);
    + this->success.resize(_size794);
    + uint32_t _i798;
    + for (_i798 = 0; _i798 < _size794; ++_i798)
                  {
    - xfer += iprot->readString(this->success[_i799]);
    + xfer += iprot->readString(this->success[_i798]);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -5145,10 +5145,10 @@ uint32_t ThriftHiveMetastore_get_tables_result::write(::apache::thrift::protocol
          xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
          {
            xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->success.size()));
    - std::vector<std::string> ::const_iterator _iter800;
    - for (_iter800 = this->success.begin(); _iter800 != this->success.end(); ++_iter800)
    + std::vector<std::string> ::const_iterator _iter799;
    + for (_iter799 = this->success.begin(); _iter799 != this->success.end(); ++_iter799)
            {
    - xfer += oprot->writeString((*_iter800));
    + xfer += oprot->writeString((*_iter799));
            }
            xfer += oprot->writeListEnd();
          }
    @@ -5193,14 +5193,14 @@ uint32_t ThriftHiveMetastore_get_tables_presult::read(::apache::thrift::protocol
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  (*(this->success)).clear();
    - uint32_t _size801;
    - ::apache::thrift::protocol::TType _etype804;
    - xfer += iprot->readListBegin(_etype804, _size801);
    - (*(this->success)).resize(_size801);
    - uint32_t _i805;
    - for (_i805 = 0; _i805 < _size801; ++_i805)
    + uint32_t _size800;
    + ::apache::thrift::protocol::TType _etype803;
    + xfer += iprot->readListBegin(_etype803, _size800);
    + (*(this->success)).resize(_size800);
    + uint32_t _i804;
    + for (_i804 = 0; _i804 < _size800; ++_i804)
                  {
    - xfer += iprot->readString((*(this->success))[_i805]);
    + xfer += iprot->readString((*(this->success))[_i804]);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -5338,14 +5338,14 @@ uint32_t ThriftHiveMetastore_get_all_tables_result::read(::apache::thrift::proto
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->success.clear();
    - uint32_t _size806;
    - ::apache::thrift::protocol::TType _etype809;
    - xfer += iprot->readListBegin(_etype809, _size806);
    - this->success.resize(_size806);
    - uint32_t _i810;
    - for (_i810 = 0; _i810 < _size806; ++_i810)
    + uint32_t _size805;
    + ::apache::thrift::protocol::TType _etype808;
    + xfer += iprot->readListBegin(_etype808, _size805);
    + this->success.resize(_size805);
    + uint32_t _i809;
    + for (_i809 = 0; _i809 < _size805; ++_i809)
                  {
    - xfer += iprot->readString(this->success[_i810]);
    + xfer += iprot->readString(this->success[_i809]);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -5384,10 +5384,10 @@ uint32_t ThriftHiveMetastore_get_all_tables_result::write(::apache::thrift::prot
          xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
          {
            xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->success.size()));
    - std::vector<std::string> ::const_iterator _iter811;
    - for (_iter811 = this->success.begin(); _iter811 != this->success.end(); ++_iter811)
    + std::vector<std::string> ::const_iterator _iter810;
    + for (_iter810 = this->success.begin(); _iter810 != this->success.end(); ++_iter810)
            {
    - xfer += oprot->writeString((*_iter811));
    + xfer += oprot->writeString((*_iter810));
            }
            xfer += oprot->writeListEnd();
          }
    @@ -5432,14 +5432,14 @@ uint32_t ThriftHiveMetastore_get_all_tables_presult::read(::apache::thrift::prot
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  (*(this->success)).clear();
    - uint32_t _size812;
    - ::apache::thrift::protocol::TType _etype815;
    - xfer += iprot->readListBegin(_etype815, _size812);
    - (*(this->success)).resize(_size812);
    - uint32_t _i816;
    - for (_i816 = 0; _i816 < _size812; ++_i816)
    + uint32_t _size811;
    + ::apache::thrift::protocol::TType _etype814;
    + xfer += iprot->readListBegin(_etype814, _size811);
    + (*(this->success)).resize(_size811);
    + uint32_t _i815;
    + for (_i815 = 0; _i815 < _size811; ++_i815)
                  {
    - xfer += iprot->readString((*(this->success))[_i816]);
    + xfer += iprot->readString((*(this->success))[_i815]);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -5749,14 +5749,14 @@ uint32_t ThriftHiveMetastore_get_table_objects_by_name_args::read(::apache::thri
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->tbl_names.clear();
    - uint32_t _size817;
    - ::apache::thrift::protocol::TType _etype820;
    - xfer += iprot->readListBegin(_etype820, _size817);
    - this->tbl_names.resize(_size817);
    - uint32_t _i821;
    - for (_i821 = 0; _i821 < _size817; ++_i821)
    + uint32_t _size816;
    + ::apache::thrift::protocol::TType _etype819;
    + xfer += iprot->readListBegin(_etype819, _size816);
    + this->tbl_names.resize(_size816);
    + uint32_t _i820;
    + for (_i820 = 0; _i820 < _size816; ++_i820)
                  {
    - xfer += iprot->readString(this->tbl_names[_i821]);
    + xfer += iprot->readString(this->tbl_names[_i820]);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -5789,10 +5789,10 @@ uint32_t ThriftHiveMetastore_get_table_objects_by_name_args::write(::apache::thr
        xfer += oprot->writeFieldBegin("tbl_names", ::apache::thrift::protocol::T_LIST, 2);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->tbl_names.size()));
    - std::vector<std::string> ::const_iterator _iter822;
    - for (_iter822 = this->tbl_names.begin(); _iter822 != this->tbl_names.end(); ++_iter822)
    + std::vector<std::string> ::const_iterator _iter821;
    + for (_iter821 = this->tbl_names.begin(); _iter821 != this->tbl_names.end(); ++_iter821)
          {
    - xfer += oprot->writeString((*_iter822));
    + xfer += oprot->writeString((*_iter821));
          }
          xfer += oprot->writeListEnd();
        }
    @@ -5820,10 +5820,10 @@ uint32_t ThriftHiveMetastore_get_table_objects_by_name_pargs::write(::apache::th
        xfer += oprot->writeFieldBegin("tbl_names", ::apache::thrift::protocol::T_LIST, 2);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>((*(this->tbl_names)).size()));
    - std::vector<std::string> ::const_iterator _iter823;
    - for (_iter823 = (*(this->tbl_names)).begin(); _iter823 != (*(this->tbl_names)).end(); ++_iter823)
    + std::vector<std::string> ::const_iterator _iter822;
    + for (_iter822 = (*(this->tbl_names)).begin(); _iter822 != (*(this->tbl_names)).end(); ++_iter822)
          {
    - xfer += oprot->writeString((*_iter823));
    + xfer += oprot->writeString((*_iter822));
          }
          xfer += oprot->writeListEnd();
        }
    @@ -5864,14 +5864,14 @@ uint32_t ThriftHiveMetastore_get_table_objects_by_name_result::read(::apache::th
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->success.clear();
    - uint32_t _size824;
    - ::apache::thrift::protocol::TType _etype827;
    - xfer += iprot->readListBegin(_etype827, _size824);
    - this->success.resize(_size824);
    - uint32_t _i828;
    - for (_i828 = 0; _i828 < _size824; ++_i828)
    + uint32_t _size823;
    + ::apache::thrift::protocol::TType _etype826;
    + xfer += iprot->readListBegin(_etype826, _size823);
    + this->success.resize(_size823);
    + uint32_t _i827;
    + for (_i827 = 0; _i827 < _size823; ++_i827)
                  {
    - xfer += this->success[_i828].read(iprot);
    + xfer += this->success[_i827].read(iprot);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -5926,10 +5926,10 @@ uint32_t ThriftHiveMetastore_get_table_objects_by_name_result::write(::apache::t
          xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
          {
            xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
    - std::vector<Table> ::const_iterator _iter829;
    - for (_iter829 = this->success.begin(); _iter829 != this->success.end(); ++_iter829)
    + std::vector<Table> ::const_iterator _iter828;
    + for (_iter828 = this->success.begin(); _iter828 != this->success.end(); ++_iter828)
            {
    - xfer += (*_iter829).write(oprot);
    + xfer += (*_iter828).write(oprot);
            }
            xfer += oprot->writeListEnd();
          }
    @@ -5982,14 +5982,14 @@ uint32_t ThriftHiveMetastore_get_table_objects_by_name_presult::read(::apache::t
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  (*(this->success)).clear();
    - uint32_t _size830;
    - ::apache::thrift::protocol::TType _etype833;
    - xfer += iprot->readListBegin(_etype833, _size830);
    - (*(this->success)).resize(_size830);
    - uint32_t _i834;
    - for (_i834 = 0; _i834 < _size830; ++_i834)
    + uint32_t _size829;
    + ::apache::thrift::protocol::TType _etype832;
    + xfer += iprot->readListBegin(_etype832, _size829);
    + (*(this->success)).resize(_size829);
    + uint32_t _i833;
    + for (_i833 = 0; _i833 < _size829; ++_i833)
                  {
    - xfer += (*(this->success))[_i834].read(iprot);
    + xfer += (*(this->success))[_i833].read(iprot);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -6175,14 +6175,14 @@ uint32_t ThriftHiveMetastore_get_table_names_by_filter_result::read(::apache::th
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->success.clear();
    - uint32_t _size835;
    - ::apache::thrift::protocol::TType _etype838;
    - xfer += iprot->readListBegin(_etype838, _size835);
    - this->success.resize(_size835);
    - uint32_t _i839;
    - for (_i839 = 0; _i839 < _size835; ++_i839)
    + uint32_t _size834;
    + ::apache::thrift::protocol::TType _etype837;
    + xfer += iprot->readListBegin(_etype837, _size834);
    + this->success.resize(_size834);
    + uint32_t _i838;
    + for (_i838 = 0; _i838 < _size834; ++_i838)
                  {
    - xfer += iprot->readString(this->success[_i839]);
    + xfer += iprot->readString(this->success[_i838]);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -6237,10 +6237,10 @@ uint32_t ThriftHiveMetastore_get_table_names_by_filter_result::write(::apache::t
          xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
          {
            xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->success.size()));
    - std::vector<std::string> ::const_iterator _iter840;
    - for (_iter840 = this->success.begin(); _iter840 != this->success.end(); ++_iter840)
    + std::vector<std::string> ::const_iterator _iter839;
    + for (_iter839 = this->success.begin(); _iter839 != this->success.end(); ++_iter839)
            {
    - xfer += oprot->writeString((*_iter840));
    + xfer += oprot->writeString((*_iter839));
            }
            xfer += oprot->writeListEnd();
          }
    @@ -6293,14 +6293,14 @@ uint32_t ThriftHiveMetastore_get_table_names_by_filter_presult::read(::apache::t
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  (*(this->success)).clear();
    - uint32_t _size841;
    - ::apache::thrift::protocol::TType _etype844;
    - xfer += iprot->readListBegin(_etype844, _size841);
    - (*(this->success)).resize(_size841);
    - uint32_t _i845;
    - for (_i845 = 0; _i845 < _size841; ++_i845)
    + uint32_t _size840;
    + ::apache::thrift::protocol::TType _etype843;
    + xfer += iprot->readListBegin(_etype843, _size840);
    + (*(this->success)).resize(_size840);
    + uint32_t _i844;
    + for (_i844 = 0; _i844 < _size840; ++_i844)
                  {
    - xfer += iprot->readString((*(this->success))[_i845]);
    + xfer += iprot->readString((*(this->success))[_i844]);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -7634,14 +7634,14 @@ uint32_t ThriftHiveMetastore_add_partitions_args::read(::apache::thrift::protoco
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->new_parts.clear();
    - uint32_t _size846;
    - ::apache::thrift::protocol::TType _etype849;
    - xfer += iprot->readListBegin(_etype849, _size846);
    - this->new_parts.resize(_size846);
    - uint32_t _i850;
    - for (_i850 = 0; _i850 < _size846; ++_i850)
    + uint32_t _size845;
    + ::apache::thrift::protocol::TType _etype848;
    + xfer += iprot->readListBegin(_etype848, _size845);
    + this->new_parts.resize(_size845);
    + uint32_t _i849;
    + for (_i849 = 0; _i849 < _size845; ++_i849)
                  {
    - xfer += this->new_parts[_i850].read(iprot);
    + xfer += this->new_parts[_i849].read(iprot);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -7670,10 +7670,10 @@ uint32_t ThriftHiveMetastore_add_partitions_args::write(::apache::thrift::protoc
        xfer += oprot->writeFieldBegin("new_parts", ::apache::thrift::protocol::T_LIST, 1);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->new_parts.size()));
    - std::vector<Partition> ::const_iterator _iter851;
    - for (_iter851 = this->new_parts.begin(); _iter851 != this->new_parts.end(); ++_iter851)
    + std::vector<Partition> ::const_iterator _iter850;
    + for (_iter850 = this->new_parts.begin(); _iter850 != this->new_parts.end(); ++_iter850)
          {
    - xfer += (*_iter851).write(oprot);
    + xfer += (*_iter850).write(oprot);
          }
          xfer += oprot->writeListEnd();
        }
    @@ -7697,10 +7697,10 @@ uint32_t ThriftHiveMetastore_add_partitions_pargs::write(::apache::thrift::proto
        xfer += oprot->writeFieldBegin("new_parts", ::apache::thrift::protocol::T_LIST, 1);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>((*(this->new_parts)).size()));
    - std::vector<Partition> ::const_iterator _iter852;
    - for (_iter852 = (*(this->new_parts)).begin(); _iter852 != (*(this->new_parts)).end(); ++_iter852)
    + std::vector<Partition> ::const_iterator _iter851;
    + for (_iter851 = (*(this->new_parts)).begin(); _iter851 != (*(this->new_parts)).end(); ++_iter851)
          {
    - xfer += (*_iter852).write(oprot);
    + xfer += (*_iter851).write(oprot);
          }
          xfer += oprot->writeListEnd();
        }
    @@ -7909,14 +7909,14 @@ uint32_t ThriftHiveMetastore_add_partitions_pspec_args::read(::apache::thrift::p
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->new_parts.clear();
    - uint32_t _size853;
    - ::apache::thrift::protocol::TType _etype856;
    - xfer += iprot->readListBegin(_etype856, _size853);
    - this->new_parts.resize(_size853);
    - uint32_t _i857;
    - for (_i857 = 0; _i857 < _size853; ++_i857)
    + uint32_t _size852;
    + ::apache::thrift::protocol::TType _etype855;
    + xfer += iprot->readListBegin(_etype855, _size852);
    + this->new_parts.resize(_size852);
    + uint32_t _i856;
    + for (_i856 = 0; _i856 < _size852; ++_i856)
                  {
    - xfer += this->new_parts[_i857].read(iprot);
    + xfer += this->new_parts[_i856].read(iprot);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -7945,10 +7945,10 @@ uint32_t ThriftHiveMetastore_add_partitions_pspec_args::write(::apache::thrift::
        xfer += oprot->writeFieldBegin("new_parts", ::apache::thrift::protocol::T_LIST, 1);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->new_parts.size()));
    - std::vector<PartitionSpec> ::const_iterator _iter858;
    - for (_iter858 = this->new_parts.begin(); _iter858 != this->new_parts.end(); ++_iter858)
    + std::vector<PartitionSpec> ::const_iterator _iter857;
    + for (_iter857 = this->new_parts.begin(); _iter857 != this->new_parts.end(); ++_iter857)
          {
    - xfer += (*_iter858).write(oprot);
    + xfer += (*_iter857).write(oprot);
          }
          xfer += oprot->writeListEnd();
        }
    @@ -7972,10 +7972,10 @@ uint32_t ThriftHiveMetastore_add_partitions_pspec_pargs::write(::apache::thrift:
        xfer += oprot->writeFieldBegin("new_parts", ::apache::thrift::protocol::T_LIST, 1);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>((*(this->new_parts)).size()));
    - std::vector<PartitionSpec> ::const_iterator _iter859;
    - for (_iter859 = (*(this->new_parts)).begin(); _iter859 != (*(this->new_parts)).end(); ++_iter859)
    + std::vector<PartitionSpec> ::const_iterator _iter858;
    + for (_iter858 = (*(this->new_parts)).begin(); _iter858 != (*(this->new_parts)).end(); ++_iter858)
          {
    - xfer += (*_iter859).write(oprot);
    + xfer += (*_iter858).write(oprot);
          }
          xfer += oprot->writeListEnd();
        }
    @@ -8200,14 +8200,14 @@ uint32_t ThriftHiveMetastore_append_partition_args::read(::apache::thrift::proto
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->part_vals.clear();
    - uint32_t _size860;
    - ::apache::thrift::protocol::TType _etype863;
    - xfer += iprot->readListBegin(_etype863, _size860);
    - this->part_vals.resize(_size860);
    - uint32_t _i864;
    - for (_i864 = 0; _i864 < _size860; ++_i864)
    + uint32_t _size859;
    + ::apache::thrift::protocol::TType _etype862;
    + xfer += iprot->readListBegin(_etype862, _size859);
    + this->part_vals.resize(_size859);
    + uint32_t _i863;
    + for (_i863 = 0; _i863 < _size859; ++_i863)
                  {
    - xfer += iprot->readString(this->part_vals[_i864]);
    + xfer += iprot->readString(this->part_vals[_i863]);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -8244,10 +8244,10 @@ uint32_t ThriftHiveMetastore_append_partition_args::write(::apache::thrift::prot
        xfer += oprot->writeFieldBegin("part_vals", ::apache::thrift::protocol::T_LIST, 3);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->part_vals.size()));
    - std::vector<std::string> ::const_iterator _iter865;
    - for (_iter865 = this->part_vals.begin(); _iter865 != this->part_vals.end(); ++_iter865)
    + std::vector<std::string> ::const_iterator _iter864;
    + for (_iter864 = this->part_vals.begin(); _iter864 != this->part_vals.end(); ++_iter864)
          {
    - xfer += oprot->writeString((*_iter865));
    + xfer += oprot->writeString((*_iter864));
          }
          xfer += oprot->writeListEnd();
        }
    @@ -8279,10 +8279,10 @@ uint32_t ThriftHiveMetastore_append_partition_pargs::write(::apache::thrift::pro
        xfer += oprot->writeFieldBegin("part_vals", ::apache::thrift::protocol::T_LIST, 3);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>((*(this->part_vals)).size()));
    - std::vector<std::string> ::const_iterator _iter866;
    - for (_iter866 = (*(this->part_vals)).begin(); _iter866 != (*(this->part_vals)).end(); ++_iter866)
    + std::vector<std::string> ::const_iterator _iter865;
    + for (_iter865 = (*(this->part_vals)).begin(); _iter865 != (*(this->part_vals)).end(); ++_iter865)
          {
    - xfer += oprot->writeString((*_iter866));
    + xfer += oprot->writeString((*_iter865));
          }
          xfer += oprot->writeListEnd();
        }
    @@ -8754,14 +8754,14 @@ uint32_t ThriftHiveMetastore_append_partition_with_environment_context_args::rea
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->part_vals.clear();
    - uint32_t _size867;
    - ::apache::thrift::protocol::TType _etype870;
    - xfer += iprot->readListBegin(_etype870, _size867);
    - this->part_vals.resize(_size867);
    - uint32_t _i871;
    - for (_i871 = 0; _i871 < _size867; ++_i871)
    + uint32_t _size866;
    + ::apache::thrift::protocol::TType _etype869;
    + xfer += iprot->readListBegin(_etype869, _size866);
    + this->part_vals.resize(_size866);
    + uint32_t _i870;
    + for (_i870 = 0; _i870 < _size866; ++_i870)
                  {
    - xfer += iprot->readString(this->part_vals[_i871]);
    + xfer += iprot->readString(this->part_vals[_i870]);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -8806,10 +8806,10 @@ uint32_t ThriftHiveMetastore_append_partition_with_environment_context_args::wri
        xfer += oprot->writeFieldBegin("part_vals", ::apache::thrift::protocol::T_LIST, 3);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->part_vals.size()));
    - std::vector<std::string> ::const_iterator _iter872;
    - for (_iter872 = this->part_vals.begin(); _iter872 != this->part_vals.end(); ++_iter872)
    + std::vector<std::string> ::const_iterator _iter871;
    + for (_iter871 = this->part_vals.begin(); _iter871 != this->part_vals.end(); ++_iter871)
          {
    - xfer += oprot->writeString((*_iter872));
    + xfer += oprot->writeString((*_iter871));
          }
          xfer += oprot->writeListEnd();
        }
    @@ -8845,10 +8845,10 @@ uint32_t ThriftHiveMetastore_append_partition_with_environment_context_pargs::wr
        xfer += oprot->writeFieldBegin("part_vals", ::apache::thrift::protocol::T_LIST, 3);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>((*(this->part_vals)).size()));
    - std::vector<std::string> ::const_iterator _iter873;
    - for (_iter873 = (*(this->part_vals)).begin(); _iter873 != (*(this->part_vals)).end(); ++_iter873)
    + std::vector<std::string> ::const_iterator _iter872;
    + for (_iter872 = (*(this->part_vals)).begin(); _iter872 != (*(this->part_vals)).end(); ++_iter872)
          {
    - xfer += oprot->writeString((*_iter873));
    + xfer += oprot->writeString((*_iter872));
          }
          xfer += oprot->writeListEnd();
        }
    @@ -9651,14 +9651,14 @@ uint32_t ThriftHiveMetastore_drop_partition_args::read(::apache::thrift::protoco
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->part_vals.clear();
    - uint32_t _size874;
    - ::apache::thrift::protocol::TType _etype877;
    - xfer += iprot->readListBegin(_etype877, _size874);
    - this->part_vals.resize(_size874);
    - uint32_t _i878;
    - for (_i878 = 0; _i878 < _size874; ++_i878)
    + uint32_t _size873;
    + ::apache::thrift::protocol::TType _etype876;
    + xfer += iprot->readListBegin(_etype876, _size873);
    + this->part_vals.resize(_size873);
    + uint32_t _i877;
    + for (_i877 = 0; _i877 < _size873; ++_i877)
                  {
    - xfer += iprot->readString(this->part_vals[_i878]);
    + xfer += iprot->readString(this->part_vals[_i877]);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -9703,10 +9703,10 @@ uint32_t ThriftHiveMetastore_drop_partition_args::write(::apache::thrift::protoc
        xfer += oprot->writeFieldBegin("part_vals", ::apache::thrift::protocol::T_LIST, 3);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->part_vals.size()));
    - std::vector<std::string> ::const_iterator _iter879;
    - for (_iter879 = this->part_vals.begin(); _iter879 != this->part_vals.end(); ++_iter879)
    + std::vector<std::string> ::const_iterator _iter878;
    + for (_iter878 = this->part_vals.begin(); _iter878 != this->part_vals.end(); ++_iter878)
          {
    - xfer += oprot->writeString((*_iter879));
    + xfer += oprot->writeString((*_iter878));
          }
          xfer += oprot->writeListEnd();
        }
    @@ -9742,10 +9742,10 @@ uint32_t ThriftHiveMetastore_drop_partition_pargs::write(::apache::thrift::proto
        xfer += oprot->writeFieldBegin("part_vals", ::apache::thrift::protocol::T_LIST, 3);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>((*(this->part_vals)).size()));
    - std::vector<std::string> ::const_iterator _iter880;
    - for (_iter880 = (*(this->part_vals)).begin(); _iter880 != (*(this->part_vals)).end(); ++_iter880)
    + std::vector<std::string> ::const_iterator _iter879;
    + for (_iter879 = (*(this->part_vals)).begin(); _iter879 != (*(this->part_vals)).end(); ++_iter879)
          {
    - xfer += oprot->writeString((*_iter880));
    + xfer += oprot->writeString((*_iter879));
          }
          xfer += oprot->writeListEnd();
        }
    @@ -9954,14 +9954,14 @@ uint32_t ThriftHiveMetastore_drop_partition_with_environment_context_args::read(
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->part_vals.clear();
    - uint32_t _size881;
    - ::apache::thrift::protocol::TType _etype884;
    - xfer += iprot->readListBegin(_etype884, _size881);
    - this->part_vals.resize(_size881);
    - uint32_t _i885;
    - for (_i885 = 0; _i885 < _size881; ++_i885)
    + uint32_t _size880;
    + ::apache::thrift::protocol::TType _etype883;
    + xfer += iprot->readListBegin(_etype883, _size880);
    + this->part_vals.resize(_size880);
    + uint32_t _i884;
    + for (_i884 = 0; _i884 < _size880; ++_i884)
                  {
    - xfer += iprot->readString(this->part_vals[_i885]);
    + xfer += iprot->readString(this->part_vals[_i884]);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -10014,10 +10014,10 @@ uint32_t ThriftHiveMetastore_drop_partition_with_environment_context_args::write
        xfer += oprot->writeFieldBegin("part_vals", ::apache::thrift::protocol::T_LIST, 3);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->part_vals.size()));
    - std::vector<std::string> ::const_iterator _iter886;
    - for (_iter886 = this->part_vals.begin(); _iter886 != this->part_vals.end(); ++_iter886)
    + std::vector<std::string> ::const_iterator _iter885;
    + for (_iter885 = this->part_vals.begin(); _iter885 != this->part_vals.end(); ++_iter885)
          {
    - xfer += oprot->writeString((*_iter886));
    + xfer += oprot->writeString((*_iter885));
          }
          xfer += oprot->writeListEnd();
        }
    @@ -10057,10 +10057,10 @@ uint32_t ThriftHiveMetastore_drop_partition_with_environment_context_pargs::writ
        xfer += oprot->writeFieldBegin("part_vals", ::apache::thrift::protocol::T_LIST, 3);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>((*(this->part_vals)).size()));
    - std::vector<std::string> ::const_iterator _iter887;
    - for (_iter887 = (*(this->part_vals)).begin(); _iter887 != (*(this->part_vals)).end(); ++_iter887)
    + std::vector<std::string> ::const_iterator _iter886;
    + for (_iter886 = (*(this->part_vals)).begin(); _iter886 != (*(this->part_vals)).end(); ++_iter886)
          {
    - xfer += oprot->writeString((*_iter887));
    + xfer += oprot->writeString((*_iter886));
          }
          xfer += oprot->writeListEnd();
        }
    @@ -11066,14 +11066,14 @@ uint32_t ThriftHiveMetastore_get_partition_args::read(::apache::thrift::protocol
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->part_vals.clear();
    - uint32_t _size888;
    - ::apache::thrift::protocol::TType _etype891;
    - xfer += iprot->readListBegin(_etype891, _size888);
    - this->part_vals.resize(_size888);
    - uint32_t _i892;
    - for (_i892 = 0; _i892 < _size888; ++_i892)
    + uint32_t _size887;
    + ::apache::thrift::protocol::TType _etype890;
    + xfer += iprot->readListBegin(_etype890, _size887);
    + this->part_vals.resize(_size887);
    + uint32_t _i891;
    + for (_i891 = 0; _i891 < _size887; ++_i891)
                  {
    - xfer += iprot->readString(this->part_vals[_i892]);
    + xfer += iprot->readString(this->part_vals[_i891]);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -11110,10 +11110,10 @@ uint32_t ThriftHiveMetastore_get_partition_args::write(::apache::thrift::protoco
        xfer += oprot->writeFieldBegin("part_vals", ::apache::thrift::protocol::T_LIST, 3);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->part_vals.size()));
    - std::vector<std::string> ::const_iterator _iter893;
    - for (_iter893 = this->part_vals.begin(); _iter893 != this->part_vals.end(); ++_iter893)
    + std::vector<std::string> ::const_iterator _iter892;
    + for (_iter892 = this->part_vals.begin(); _iter892 != this->part_vals.end(); ++_iter892)
          {
    - xfer += oprot->writeString((*_iter893));
    + xfer += oprot->writeString((*_iter892));
          }
          xfer += oprot->writeListEnd();
        }
    @@ -11145,10 +11145,10 @@ uint32_t ThriftHiveMetastore_get_partition_pargs::write(::apache::thrift::protoc
        xfer += oprot->writeFieldBegin("part_vals", ::apache::thrift::protocol::T_LIST, 3);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>((*(this->part_vals)).size()));
    - std::vector<std::string> ::const_iterator _iter894;
    - for (_iter894 = (*(this->part_vals)).begin(); _iter894 != (*(this->part_vals)).end(); ++_iter894)
    + std::vector<std::string> ::const_iterator _iter893;
    + for (_iter893 = (*(this->part_vals)).begin(); _iter893 != (*(this->part_vals)).end(); ++_iter893)
          {
    - xfer += oprot->writeString((*_iter894));
    + xfer += oprot->writeString((*_iter893));
          }
          xfer += oprot->writeListEnd();
        }
    @@ -11337,17 +11337,17 @@ uint32_t ThriftHiveMetastore_exchange_partition_args::read(::apache::thrift::pro
              if (ftype == ::apache::thrift::protocol::T_MAP) {
                {
                  this->partitionSpecs.clear();
    - uint32_t _size895;
    - ::apache::thrift::protocol::TType _ktype896;
    - ::apache::thrift::protocol::TType _vtype897;
    - xfer += iprot->readMapBegin(_ktype896, _vtype897, _size895);
    - uint32_t _i899;
    - for (_i899 = 0; _i899 < _size895; ++_i899)
    + uint32_t _size894;
    + ::apache::thrift::protocol::TType _ktype895;
    + ::apache::thrift::protocol::TType _vtype896;
    + xfer += iprot->readMapBegin(_ktype895, _vtype896, _size894);
    + uint32_t _i898;
    + for (_i898 = 0; _i898 < _size894; ++_i898)
                  {
    - std::string _key900;
    - xfer += iprot->readString(_key900);
    - std::string& _val901 = this->partitionSpecs[_key900];
    - xfer += iprot->readString(_val901);
    + std::string _key899;
    + xfer += iprot->readString(_key899);
    + std::string& _val900 = this->partitionSpecs[_key899];
    + xfer += iprot->readString(_val900);
                  }
                  xfer += iprot->readMapEnd();
                }
    @@ -11408,11 +11408,11 @@ uint32_t ThriftHiveMetastore_exchange_partition_args::write(::apache::thrift::pr
        xfer += oprot->writeFieldBegin("partitionSpecs", ::apache::thrift::protocol::T_MAP, 1);
        {
          xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->partitionSpecs.size()));
    - std::map<std::string, std::string> ::const_iterator _iter902;
    - for (_iter902 = this->partitionSpecs.begin(); _iter902 != this->partitionSpecs.end(); ++_iter902)
    + std::map<std::string, std::string> ::const_iterator _iter901;
    + for (_iter901 = this->partitionSpecs.begin(); _iter901 != this->partitionSpecs.end(); ++_iter901)
          {
    - xfer += oprot->writeString(_iter902->first);
    - xfer += oprot->writeString(_iter902->second);
    + xfer += oprot->writeString(_iter901->first);
    + xfer += oprot->writeString(_iter901->second);
          }
          xfer += oprot->writeMapEnd();
        }
    @@ -11452,11 +11452,11 @@ uint32_t ThriftHiveMetastore_exchange_partition_pargs::write(::apache::thrift::p
        xfer += oprot->writeFieldBegin("partitionSpecs", ::apache::thrift::protocol::T_MAP, 1);
        {
          xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>((*(this->partitionSpecs)).size()));
    - std::map<std::string, std::string> ::const_iterator _iter903;
    - for (_iter903 = (*(this->partitionSpecs)).begin(); _iter903 != (*(this->partitionSpecs)).end(); ++_iter903)
    + std::map<std::string, std::string> ::const_iterator _iter902;
    + for (_iter902 = (*(this->partitionSpecs)).begin(); _iter902 != (*(this->partitionSpecs)).end(); ++_iter902)
          {
    - xfer += oprot->writeString(_iter903->first);
    - xfer += oprot->writeString(_iter903->second);
    + xfer += oprot->writeString(_iter902->first);
    + xfer += oprot->writeString(_iter902->second);
          }
          xfer += oprot->writeMapEnd();
        }
    @@ -11717,14 +11717,14 @@ uint32_t ThriftHiveMetastore_get_partition_with_auth_args::read(::apache::thrift
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->part_vals.clear();
    - uint32_t _size904;
    - ::apache::thrift::protocol::TType _etype907;
    - xfer += iprot->readListBegin(_etype907, _size904);
    - this->part_vals.resize(_size904);
    - uint32_t _i908;
    - for (_i908 = 0; _i908 < _size904; ++_i908)
    + uint32_t _size903;
    + ::apache::thrift::protocol::TType _etype906;
    + xfer += iprot->readListBegin(_etype906, _size903);
    + this->part_vals.resize(_size903);
    + uint32_t _i907;
    + for (_i907 = 0; _i907 < _size903; ++_i907)
                  {
    - xfer += iprot->readString(this->part_vals[_i908]);
    + xfer += iprot->readString(this->part_vals[_i907]);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -11745,14 +11745,14 @@ uint32_t ThriftHiveMetastore_get_partition_with_auth_args::read(::apache::thrift
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->group_names.clear();
    - uint32_t _size909;
    - ::apache::thrift::protocol::TType _etype912;
    - xfer += iprot->readListBegin(_etype912, _size909);
    - this->group_names.resize(_size909);
    - uint32_t _i913;
    - for (_i913 = 0; _i913 < _size909; ++_i913)
    + uint32_t _size908;
    + ::apache::thrift::protocol::TType _etype911;
    + xfer += iprot->readListBegin(_etype911, _size908);
    + this->group_names.resize(_size908);
    + uint32_t _i912;
    + for (_i912 = 0; _i912 < _size908; ++_i912)
                  {
    - xfer += iprot->readString(this->group_names[_i913]);
    + xfer += iprot->readString(this->group_names[_i912]);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -11789,10 +11789,10 @@ uint32_t ThriftHiveMetastore_get_partition_with_auth_args::write(::apache::thrif
        xfer += oprot->writeFieldBegin("part_vals", ::apache::thrift::protocol::T_LIST, 3);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->part_vals.size()));
    - std::vector<std::string> ::const_iterator _iter914;
    - for (_iter914 = this->part_vals.begin(); _iter914 != this->part_vals.end(); ++_iter914)
    + std::vector<std::string> ::const_iterator _iter913;
    + for (_iter913 = this->part_vals.begin(); _iter913 != this->part_vals.end(); ++_iter913)
          {
    - xfer += oprot->writeString((*_iter914));
    + xfer += oprot->writeString((*_iter913));
          }
          xfer += oprot->writeListEnd();
        }
    @@ -11805,10 +11805,10 @@ uint32_t ThriftHiveMetastore_get_partition_with_auth_args::write(::apache::thrif
        xfer += oprot->writeFieldBegin("group_names", ::apache::thrift::protocol::T_LIST, 5);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->group_names.size()));
    - std::vector<std::string> ::const_iterator _iter915;
    - for (_iter915 = this->group_names.begin(); _iter915 != this->group_names.end(); ++_iter915)
    + std::vector<std::string> ::const_iterator _iter914;
    + for (_iter914 = this->group_names.begin(); _iter914 != this->group_names.end(); ++_iter914)
          {
    - xfer += oprot->writeString((*_iter915));
    + xfer += oprot->writeString((*_iter914));
          }
          xfer += oprot->writeListEnd();
        }
    @@ -11840,10 +11840,10 @@ uint32_t ThriftHiveMetastore_get_partition_with_auth_pargs::write(::apache::thri
        xfer += oprot->writeFieldBegin("part_vals", ::apache::thrift::protocol::T_LIST, 3);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>((*(this->part_vals)).size()));
    - std::vector<std::string> ::const_iterator _iter916;
    - for (_iter916 = (*(this->part_vals)).begin(); _iter916 != (*(this->part_vals)).end(); ++_iter916)
    + std::vector<std::string> ::const_iterator _iter915;
    + for (_iter915 = (*(this->part_vals)).begin(); _iter915 != (*(this->part_vals)).end(); ++_iter915)
          {
    - xfer += oprot->writeString((*_iter916));
    + xfer += oprot->writeString((*_iter915));
          }
          xfer += oprot->writeListEnd();
        }
    @@ -11856,10 +11856,10 @@ uint32_t ThriftHiveMetastore_get_partition_with_auth_pargs::write(::apache::thri
        xfer += oprot->writeFieldBegin("group_names", ::apache::thrift::protocol::T_LIST, 5);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>((*(this->group_names)).size()));
    - std::vector<std::string> ::const_iterator _iter917;
    - for (_iter917 = (*(this->group_names)).begin(); _iter917 != (*(this->group_names)).end(); ++_iter917)
    + std::vector<std::string> ::const_iterator _iter916;
    + for (_iter916 = (*(this->group_names)).begin(); _iter916 != (*(this->group_names)).end(); ++_iter916)
          {
    - xfer += oprot->writeString((*_iter917));
    + xfer += oprot->writeString((*_iter916));
          }
          xfer += oprot->writeListEnd();
        }
    @@ -12418,14 +12418,14 @@ uint32_t ThriftHiveMetastore_get_partitions_result::read(::apache::thrift::proto
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->success.clear();
    - uint32_t _size918;
    - ::apache::thrift::protocol::TType _etype921;
    - xfer += iprot->readListBegin(_etype921, _size918);
    - this->success.resize(_size918);
    - uint32_t _i922;
    - for (_i922 = 0; _i922 < _size918; ++_i922)
    + uint32_t _size917;
    + ::apache::thrift::protocol::TType _etype920;
    + xfer += iprot->readListBegin(_etype920, _size917);
    + this->success.resize(_size917);
    + uint32_t _i921;
    + for (_i921 = 0; _i921 < _size917; ++_i921)
                  {
    - xfer += this->success[_i922].read(iprot);
    + xfer += this->success[_i921].read(iprot);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -12472,10 +12472,10 @@ uint32_t ThriftHiveMetastore_get_partitions_result::write(::apache::thrift::prot
          xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
          {
            xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
    - std::vector<Partition> ::const_iterator _iter923;
    - for (_iter923 = this->success.begin(); _iter923 != this->success.end(); ++_iter923)
    + std::vector<Partition> ::const_iterator _iter922;
    + for (_iter922 = this->success.begin(); _iter922 != this->success.end(); ++_iter922)
            {
    - xfer += (*_iter923).write(oprot);
    + xfer += (*_iter922).write(oprot);
            }
            xfer += oprot->writeListEnd();
          }
    @@ -12524,14 +12524,14 @@ uint32_t ThriftHiveMetastore_get_partitions_presult::read(::apache::thrift::prot
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  (*(this->success)).clear();
    - uint32_t _size924;
    - ::apache::thrift::protocol::TType _etype927;
    - xfer += iprot->readListBegin(_etype927, _size924);
    - (*(this->success)).resize(_size924);
    - uint32_t _i928;
    - for (_i928 = 0; _i928 < _size924; ++_i928)
    + uint32_t _size923;
    + ::apache::thrift::protocol::TType _etype926;
    + xfer += iprot->readListBegin(_etype926, _size923);
    + (*(this->success)).resize(_size923);
    + uint32_t _i927;
    + for (_i927 = 0; _i927 < _size923; ++_i927)
                  {
    - xfer += (*(this->success))[_i928].read(iprot);
    + xfer += (*(this->success))[_i927].read(iprot);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -12630,14 +12630,14 @@ uint32_t ThriftHiveMetastore_get_partitions_with_auth_args::read(::apache::thrif
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->group_names.clear();
    - uint32_t _size929;
    - ::apache::thrift::protocol::TType _etype932;
    - xfer += iprot->readListBegin(_etype932, _size929);
    - this->group_names.resize(_size929);
    - uint32_t _i933;
    - for (_i933 = 0; _i933 < _size929; ++_i933)
    + uint32_t _size928;
    + ::apache::thrift::protocol::TType _etype931;
    + xfer += iprot->readListBegin(_etype931, _size928);
    + this->group_names.resize(_size928);
    + uint32_t _i932;
    + for (_i932 = 0; _i932 < _size928; ++_i932)
                  {
    - xfer += iprot->readString(this->group_names[_i933]);
    + xfer += iprot->readString(this->group_names[_i932]);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -12682,10 +12682,10 @@ uint32_t ThriftHiveMetastore_get_partitions_with_auth_args::write(::apache::thri
        xfer += oprot->writeFieldBegin("group_names", ::apache::thrift::protocol::T_LIST, 5);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->group_names.size()));
    - std::vector<std::string> ::const_iterator _iter934;
    - for (_iter934 = this->group_names.begin(); _iter934 != this->group_names.end(); ++_iter934)
    + std::vector<std::string> ::const_iterator _iter933;
    + for (_iter933 = this->group_names.begin(); _iter933 != this->group_names.end(); ++_iter933)
          {
    - xfer += oprot->writeString((*_iter934));
    + xfer += oprot->writeString((*_iter933));
          }
          xfer += oprot->writeListEnd();
        }
    @@ -12725,10 +12725,10 @@ uint32_t ThriftHiveMetastore_get_partitions_with_auth_pargs::write(::apache::thr
        xfer += oprot->writeFieldBegin("group_names", ::apache::thrift::protocol::T_LIST, 5);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>((*(this->group_names)).size()));
    - std::vector<std::string> ::const_iterator _iter935;
    - for (_iter935 = (*(this->group_names)).begin(); _iter935 != (*(this->group_names)).end(); ++_iter935)
    + std::vector<std::string> ::const_iterator _iter934;
    + for (_iter934 = (*(this->group_names)).begin(); _iter934 != (*(this->group_names)).end(); ++_iter934)
          {
    - xfer += oprot->writeString((*_iter935));
    + xfer += oprot->writeString((*_iter934));
          }
          xfer += oprot->writeListEnd();
        }
    @@ -12769,14 +12769,14 @@ uint32_t ThriftHiveMetastore_get_partitions_with_auth_result::read(::apache::thr
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->success.clear();
    - uint32_t _size936;
    - ::apache::thrift::protocol::TType _etype939;
    - xfer += iprot->readListBegin(_etype939, _size936);
    - this->success.resize(_size936);
    - uint32_t _i940;
    - for (_i940 = 0; _i940 < _size936; ++_i940)
    + uint32_t _size935;
    + ::apache::thrift::protocol::TType _etype938;
    + xfer += iprot->readListBegin(_etype938, _size935);
    + this->success.resize(_size935);
    + uint32_t _i939;
    + for (_i939 = 0; _i939 < _size935; ++_i939)
                  {
    - xfer += this->success[_i940].read(iprot);
    + xfer += this->success[_i939].read(iprot);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -12823,10 +12823,10 @@ uint32_t ThriftHiveMetastore_get_partitions_with_auth_result::write(::apache::th
          xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
          {
            xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
    - std::vector<Partition> ::const_iterator _iter941;
    - for (_iter941 = this->success.begin(); _iter941 != this->success.end(); ++_iter941)
    + std::vector<Partition> ::const_iterator _iter940;
    + for (_iter940 = this->success.begin(); _iter940 != this->success.end(); ++_iter940)
            {
    - xfer += (*_iter941).write(oprot);
    + xfer += (*_iter940).write(oprot);
            }
            xfer += oprot->writeListEnd();
          }
    @@ -12875,14 +12875,14 @@ uint32_t ThriftHiveMetastore_get_partitions_with_auth_presult::read(::apache::th
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  (*(this->success)).clear();
    - uint32_t _size942;
    - ::apache::thrift::protocol::TType _etype945;
    - xfer += iprot->readListBegin(_etype945, _size942);
    - (*(this->success)).resize(_size942);
    - uint32_t _i946;
    - for (_i946 = 0; _i946 < _size942; ++_i946)
    + uint32_t _size941;
    + ::apache::thrift::protocol::TType _etype944;
    + xfer += iprot->readListBegin(_etype944, _size941);
    + (*(this->success)).resize(_size941);
    + uint32_t _i945;
    + for (_i945 = 0; _i945 < _size941; ++_i945)
                  {
    - xfer += (*(this->success))[_i946].read(iprot);
    + xfer += (*(this->success))[_i945].read(iprot);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -13060,14 +13060,14 @@ uint32_t ThriftHiveMetastore_get_partitions_pspec_result::read(::apache::thrift:
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->success.clear();
    - uint32_t _size947;
    - ::apache::thrift::protocol::TType _etype950;
    - xfer += iprot->readListBegin(_etype950, _size947);
    - this->success.resize(_size947);
    - uint32_t _i951;
    - for (_i951 = 0; _i951 < _size947; ++_i951)
    + uint32_t _size946;
    + ::apache::thrift::protocol::TType _etype949;
    + xfer += iprot->readListBegin(_etype949, _size946);
    + this->success.resize(_size946);
    + uint32_t _i950;
    + for (_i950 = 0; _i950 < _size946; ++_i950)
                  {
    - xfer += this->success[_i951].read(iprot);
    + xfer += this->success[_i950].read(iprot);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -13114,10 +13114,10 @@ uint32_t ThriftHiveMetastore_get_partitions_pspec_result::write(::apache::thrift
          xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
          {
            xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
    - std::vector<PartitionSpec> ::const_iterator _iter952;
    - for (_iter952 = this->success.begin(); _iter952 != this->success.end(); ++_iter952)
    + std::vector<PartitionSpec> ::const_iterator _iter951;
    + for (_iter951 = this->success.begin(); _iter951 != this->success.end(); ++_iter951)
            {
    - xfer += (*_iter952).write(oprot);
    + xfer += (*_iter951).write(oprot);
            }
            xfer += oprot->writeListEnd();
          }
    @@ -13166,14 +13166,14 @@ uint32_t ThriftHiveMetastore_get_partitions_pspec_presult::read(::apache::thrift
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  (*(this->success)).clear();
    - uint32_t _size953;
    - ::apache::thrift::protocol::TType _etype956;
    - xfer += iprot->readListBegin(_etype956, _size953);
    - (*(this->success)).resize(_size953);
    - uint32_t _i957;
    - for (_i957 = 0; _i957 < _size953; ++_i957)
    + uint32_t _size952;
    + ::apache::thrift::protocol::TType _etype955;
    + xfer += iprot->readListBegin(_etype955, _size952);
    + (*(this->success)).resize(_size952);
    + uint32_t _i956;
    + for (_i956 = 0; _i956 < _size952; ++_i956)
                  {
    - xfer += (*(this->success))[_i957].read(iprot);
    + xfer += (*(this->success))[_i956].read(iprot);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -13351,14 +13351,14 @@ uint32_t ThriftHiveMetastore_get_partition_names_result::read(::apache::thrift::
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->success.clear();
    - uint32_t _size958;
    - ::apache::thrift::protocol::TType _etype961;
    - xfer += iprot->readListBegin(_etype961, _size958);
    - this->success.resize(_size958);
    - uint32_t _i962;
    - for (_i962 = 0; _i962 < _size958; ++_i962)
    + uint32_t _size957;
    + ::apache::thrift::protocol::TType _etype960;
    + xfer += iprot->readListBegin(_etype960, _size957);
    + this->success.resize(_size957);
    + uint32_t _i961;
    + for (_i961 = 0; _i961 < _size957; ++_i961)
                  {
    - xfer += iprot->readString(this->success[_i962]);
    + xfer += iprot->readString(this->success[_i961]);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -13397,10 +13397,10 @@ uint32_t ThriftHiveMetastore_get_partition_names_result::write(::apache::thrift:
          xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
          {
            xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->success.size()));
    - std::vector<std::string> ::const_iterator _iter963;
    - for (_iter963 = this->success.begin(); _iter963 != this->success.end(); ++_iter963)
    + std::vector<std::string> ::const_iterator _iter962;
    + for (_iter962 = this->success.begin(); _iter962 != this->success.end(); ++_iter962)
            {
    - xfer += oprot->writeString((*_iter963));
    + xfer += oprot->writeString((*_iter962));
            }
            xfer += oprot->writeListEnd();
          }
    @@ -13445,14 +13445,14 @@ uint32_t ThriftHiveMetastore_get_partition_names_presult::read(::apache::thrift:
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  (*(this->success)).clear();
    - uint32_t _size964;
    - ::apache::thrift::protocol::TType _etype967;
    - xfer += iprot->readListBegin(_etype967, _size964);
    - (*(this->success)).resize(_size964);
    - uint32_t _i968;
    - for (_i968 = 0; _i968 < _size964; ++_i968)
    + uint32_t _size963;
    + ::apache::thrift::protocol::TType _etype966;
    + xfer += iprot->readListBegin(_etype966, _size963);
    + (*(this->success)).resize(_size963);
    + uint32_t _i967;
    + for (_i967 = 0; _i967 < _size963; ++_i967)
                  {
    - xfer += iprot->readString((*(this->success))[_i968]);
    + xfer += iprot->readString((*(this->success))[_i967]);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -13527,14 +13527,14 @@ uint32_t ThriftHiveMetastore_get_partitions_ps_args::read(::apache::thrift::prot
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->part_vals.clear();
    - uint32_t _size969;
    - ::apache::thrift::protocol::TType _etype972;
    - xfer += iprot->readListBegin(_etype972, _size969);
    - this->part_vals.resize(_size969);
    - uint32_t _i973;
    - for (_i973 = 0; _i973 < _size969; ++_i973)
    + uint32_t _size968;
    + ::apache::thrift::protocol::TType _etype971;
    + xfer += iprot->readListBegin(_etype971, _size968);
    + this->part_vals.resize(_size968);
    + uint32_t _i972;
    + for (_i972 = 0; _i972 < _size968; ++_i972)
                  {
    - xfer += iprot->readString(this->part_vals[_i973]);
    + xfer += iprot->readString(this->part_vals[_i972]);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -13579,10 +13579,10 @@ uint32_t ThriftHiveMetastore_get_partitions_ps_args::write(::apache::thrift::pro
        xfer += oprot->writeFieldBegin("part_vals", ::apache::thrift::protocol::T_LIST, 3);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->part_vals.size()));
    - std::vector<std::string> ::const_iterator _iter974;
    - for (_iter974 = this->part_vals.begin(); _iter974 != this->part_vals.end(); ++_iter974)
    + std::vector<std::string> ::const_iterator _iter973;
    + for (_iter973 = this->part_vals.begin(); _iter973 != this->part_vals.end(); ++_iter973)
          {
    - xfer += oprot->writeString((*_iter974));
    + xfer += oprot->writeString((*_iter973));
          }
          xfer += oprot->writeListEnd();
        }
    @@ -13618,10 +13618,10 @@ uint32_t ThriftHiveMetastore_get_partitions_ps_pargs::write(::apache::thrift::pr
        xfer += oprot->writeFieldBegin("part_vals", ::apache::thrift::protocol::T_LIST, 3);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>((*(this->part_vals)).size()));
    - std::vector<std::string> ::const_iterator _iter975;
    - for (_iter975 = (*(this->part_vals)).begin(); _iter975 != (*(this->part_vals)).end(); ++_iter975)
    + std::vector<std::string> ::const_iterator _iter974;
    + for (_iter974 = (*(this->part_vals)).begin(); _iter974 != (*(this->part_vals)).end(); ++_iter974)
          {
    - xfer += oprot->writeString((*_iter975));
    + xfer += oprot->writeString((*_iter974));
          }
          xfer += oprot->writeListEnd();
        }
    @@ -13666,14 +13666,14 @@ uint32_t ThriftHiveMetastore_get_partitions_ps_result::read(::apache::thrift::pr
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->success.clear();
    - uint32_t _size976;
    - ::apache::thrift::protocol::TType _etype979;
    - xfer += iprot->readListBegin(_etype979, _size976);
    - this->success.resize(_size976);
    - uint32_t _i980;
    - for (_i980 = 0; _i980 < _size976; ++_i980)
    + uint32_t _size975;
    + ::apache::thrift::protocol::TType _etype978;
    + xfer += iprot->readListBegin(_etype978, _size975);
    + this->success.resize(_size975);
    + uint32_t _i979;
    + for (_i979 = 0; _i979 < _size975; ++_i979)
                  {
    - xfer += this->success[_i980].read(iprot);
    + xfer += this->success[_i979].read(iprot);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -13720,10 +13720,10 @@ uint32_t ThriftHiveMetastore_get_partitions_ps_result::write(::apache::thrift::p
          xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
          {
            xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
    - std::vector<Partition> ::const_iterator _iter981;
    - for (_iter981 = this->success.begin(); _iter981 != this->success.end(); ++_iter981)
    + std::vector<Partition> ::const_iterator _iter980;
    + for (_iter980 = this->success.begin(); _iter980 != this->success.end(); ++_iter980)
            {
    - xfer += (*_iter981).write(oprot);
    + xfer += (*_iter980).write(oprot);
            }
            xfer += oprot->writeListEnd();
          }
    @@ -13772,14 +13772,14 @@ uint32_t ThriftHiveMetastore_get_partitions_ps_presult::read(::apache::thrift::p
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  (*(this->success)).clear();
    - uint32_t _size982;
    - ::apache::thrift::protocol::TType _etype985;
    - xfer += iprot->readListBegin(_etype985, _size982);
    - (*(this->success)).resize(_size982);
    - uint32_t _i986;
    - for (_i986 = 0; _i986 < _size982; ++_i986)
    + uint32_t _size981;
    + ::apache::thrift::protocol::TType _etype984;
    + xfer += iprot->readListBegin(_etype984, _size981);
    + (*(this->success)).resize(_size981);
    + uint32_t _i985;
    + for (_i985 = 0; _i985 < _size981; ++_i985)
                  {
    - xfer += (*(this->success))[_i986].read(iprot);
    + xfer += (*(this->success))[_i985].read(iprot);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -13862,14 +13862,14 @@ uint32_t ThriftHiveMetastore_get_partitions_ps_with_auth_args::read(::apache::th
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->part_vals.clear();
    - uint32_t _size987;
    - ::apache::thrift::protocol::TType _etype990;
    - xfer += iprot->readListBegin(_etype990, _size987);
    - this->part_vals.resize(_size987);
    - uint32_t _i991;
    - for (_i991 = 0; _i991 < _size987; ++_i991)
    + uint32_t _size986;
    + ::apache::thrift::protocol::TType _etype989;
    + xfer += iprot->readListBegin(_etype989, _size986);
    + this->part_vals.resize(_size986);
    + uint32_t _i990;
    + for (_i990 = 0; _i990 < _size986; ++_i990)
                  {
    - xfer += iprot->readString(this->part_vals[_i991]);
    + xfer += iprot->readString(this->part_vals[_i990]);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -13898,14 +13898,14 @@ uint32_t ThriftHiveMetastore_get_partitions_ps_with_auth_args::read(::apache::th
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->group_names.clear();
    - uint32_t _size992;
    - ::apache::thrift::protocol::TType _etype995;
    - xfer += iprot->readListBegin(_etype995, _size992);
    - this->group_names.resize(_size992);
    - uint32_t _i996;
    - for (_i996 = 0; _i996 < _size992; ++_i996)
    + uint32_t _size991;
    + ::apache::thrift::protocol::TType _etype994;
    + xfer += iprot->readListBegin(_etype994, _size991);
    + this->group_names.resize(_size991);
    + uint32_t _i995;
    + for (_i995 = 0; _i995 < _size991; ++_i995)
                  {
    - xfer += iprot->readString(this->group_names[_i996]);
    + xfer += iprot->readString(this->group_names[_i995]);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -13942,10 +13942,10 @@ uint32_t ThriftHiveMetastore_get_partitions_ps_with_auth_args::write(::apache::t
        xfer += oprot->writeFieldBegin("part_vals", ::apache::thrift::protocol::T_LIST, 3);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->part_vals.size()));
    - std::vector<std::string> ::const_iterator _iter997;
    - for (_iter997 = this->part_vals.begin(); _iter997 != this->part_vals.end(); ++_iter997)
    + std::vector<std::string> ::const_iterator _iter996;
    + for (_iter996 = this->part_vals.begin(); _iter996 != this->part_vals.end(); ++_iter996)
          {
    - xfer += oprot->writeString((*_iter997));
    + xfer += oprot->writeString((*_iter996));
          }
          xfer += oprot->writeListEnd();
        }
    @@ -13962,10 +13962,10 @@ uint32_t ThriftHiveMetastore_get_partitions_ps_with_auth_args::write(::apache::t
        xfer += oprot->writeFieldBegin("group_names", ::apache::thrift::protocol::T_LIST, 6);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->group_names.size()));
    - std::vector<std::string> ::const_iterator _iter998;
    - for (_iter998 = this->group_names.begin(); _iter998 != this->group_names.end(); ++_iter998)
    + std::vector<std::string> ::const_iterator _iter997;
    + for (_iter997 = this->group_names.begin(); _iter997 != this->group_names.end(); ++_iter997)
          {
    - xfer += oprot->writeString((*_iter998));
    + xfer += oprot->writeString((*_iter997));
          }
          xfer += oprot->writeListEnd();
        }
    @@ -13997,10 +13997,10 @@ uint32_t ThriftHiveMetastore_get_partitions_ps_with_auth_pargs::write(::apache::
        xfer += oprot->writeFieldBegin("part_vals", ::apache::thrift::protocol::T_LIST, 3);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>((*(this->part_vals)).size()));
    - std::vector<std::string> ::const_iterator _iter999;
    - for (_iter999 = (*(this->part_vals)).begin(); _iter999 != (*(this->part_vals)).end(); ++_iter999)
    + std::vector<std::string> ::const_iterator _iter998;
    + for (_iter998 = (*(this->part_vals)).begin(); _iter998 != (*(this->part_vals)).end(); ++_iter998)
          {
    - xfer += oprot->writeString((*_iter999));
    + xfer += oprot->writeString((*_iter998));
          }
          xfer += oprot->writeListEnd();
        }
    @@ -14017,10 +14017,10 @@ uint32_t ThriftHiveMetastore_get_partitions_ps_with_auth_pargs::write(::apache::
        xfer += oprot->writeFieldBegin("group_names", ::apache::thrift::protocol::T_LIST, 6);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>((*(this->group_names)).size()));
    - std::vector<std::string> ::const_iterator _iter1000;
    - for (_iter1000 = (*(this->group_names)).begin(); _iter1000 != (*(this->group_names)).end(); ++_iter1000)
    + std::vector<std::string> ::const_iterator _iter999;
    + for (_iter999 = (*(this->group_names)).begin(); _iter999 != (*(this->group_names)).end(); ++_iter999)
          {
    - xfer += oprot->writeString((*_iter1000));
    + xfer += oprot->writeString((*_iter999));
          }
          xfer += oprot->writeListEnd();
        }
    @@ -14061,14 +14061,14 @@ uint32_t ThriftHiveMetastore_get_partitions_ps_with_auth_result::read(::apache::
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->success.clear();
    - uint32_t _size1001;
    - ::apache::thrift::protocol::TType _etype1004;
    - xfer += iprot->readListBegin(_etype1004, _size1001);
    - this->success.resize(_size1001);
    - uint32_t _i1005;
    - for (_i1005 = 0; _i1005 < _size1001; ++_i1005)
    + uint32_t _size1000;
    + ::apache::thrift::protocol::TType _etype1003;
    + xfer += iprot->readListBegin(_etype1003, _size1000);
    + this->success.resize(_size1000);
    + uint32_t _i1004;
    + for (_i1004 = 0; _i1004 < _size1000; ++_i1004)
                  {
    - xfer += this->success[_i1005].read(iprot);
    + xfer += this->success[_i1004].read(iprot);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -14115,10 +14115,10 @@ uint32_t ThriftHiveMetastore_get_partitions_ps_with_auth_result::write(::apache:
          xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
          {
            xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
    - std::vector<Partition> ::const_iterator _iter1006;
    - for (_iter1006 = this->success.begin(); _iter1006 != this->success.end(); ++_iter1006)
    + std::vector<Partition> ::const_iterator _iter1005;
    + for (_iter1005 = this->success.begin(); _iter1005 != this->success.end(); ++_iter1005)
            {
    - xfer += (*_iter1006).write(oprot);
    + xfer += (*_iter1005).write(oprot);
            }
            xfer += oprot->writeListEnd();
          }
    @@ -14167,14 +14167,14 @@ uint32_t ThriftHiveMetastore_get_partitions_ps_with_auth_presult::read(::apache:
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  (*(this->success)).clear();
    - uint32_t _size1007;
    - ::apache::thrift::protocol::TType _etype1010;
    - xfer += iprot->readListBegin(_etype1010, _size1007);
    - (*(this->success)).resize(_size1007);
    - uint32_t _i1011;
    - for (_i1011 = 0; _i1011 < _size1007; ++_i1011)
    + uint32_t _size1006;
    + ::apache::thrift::protocol::TType _etype1009;
    + xfer += iprot->readListBegin(_etype1009, _size1006);
    + (*(this->success)).resize(_size1006);
    + uint32_t _i1010;
    + for (_i1010 = 0; _i1010 < _size1006; ++_i1010)
                  {
    - xfer += (*(this->success))[_i1011].read(iprot);
    + xfer += (*(this->success))[_i1010].read(iprot);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -14257,14 +14257,14 @@ uint32_t ThriftHiveMetastore_get_partition_names_ps_args::read(::apache::thrift:
              if (ftype == ::apache::thrift::protocol::T_LIST) {
                {
                  this->part_vals.clear();
    - uint32_t _size1012;
    - ::apache::thrift::protocol::TType _etype1015;
    - xfer += iprot->readListBegin(_etype1015, _size1012);
    - this->part_vals.resize(_size1012);
    - uint32_t _i1016;
    - for (_i1016 = 0; _i1016 < _size1012; ++_i1016)
    + uint32_t _size1011;
    + ::apache::thrift::protocol::TType _etype1014;
    + xfer += iprot->readListBegin(_etype1014, _size1011);
    + this->part_vals.resize(_size1011);
    + uint32_t _i1015;
    + for (_i1015 = 0; _i1015 < _size1011; ++_i1015)
                  {
    - xfer += iprot->readString(this->part_vals[_i1016]);
    + xfer += iprot->readString(this->part_vals[_i1015]);
                  }
                  xfer += iprot->readListEnd();
                }
    @@ -14309,10 +14309,10 @@ uint32_t ThriftHiveMetastore_get_partition_names_ps_args::write(::apache::thrift
        xfer += oprot->writeFieldBegin("part_vals", ::apache::thrift::protocol::T_LIST, 3);
        {
          xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->part_vals.size()));
    - std::vector<std::string> ::const_iterator _iter1017;
    - for (_iter1017 = this->part_vals.begin(); _iter1017 != this->part_vals.end(); ++_iter1017)
    + std::vector<std::string> ::const_iterator _iter1016;
    + for (_iter1016 = this->part_vals.begin(); _iter1016 != this->part_vals.end(); ++_iter1016)
          {
    - xfer += oprot->writeString((*_iter1017));
    + xfer

    <TRUNCATED>
  • Sershe at Oct 23, 2015 at 11:58 pm
    HIVE-12253 : revert HIVE-12061 (Sergey Shelukhin, reviewed by Prasanth Jayachandran)


    Project: http://git-wip-us.apache.org/repos/asf/hive/repo
    Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/3e0d87f8
    Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/3e0d87f8
    Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/3e0d87f8

    Branch: refs/heads/master
    Commit: 3e0d87f8114508916c4268bf3317ba3da5523def
    Parents: 2653537
    Author: Sergey Shelukhin <sershe@apache.org>
    Authored: Fri Oct 23 16:42:16 2015 -0700
    Committer: Sergey Shelukhin <sershe@apache.org>
    Committed: Fri Oct 23 16:49:14 2015 -0700

    ----------------------------------------------------------------------
      metastore/if/hive_metastore.thrift | 8 +-
      .../gen/thrift/gen-cpp/ThriftHiveMetastore.cpp | 1744 +++++++++---------
      .../gen/thrift/gen-cpp/hive_metastore_types.cpp | 402 ++--
      .../gen/thrift/gen-cpp/hive_metastore_types.h | 20 +-
      .../metastore/api/FileMetadataExprType.java | 42 -
      .../api/GetFileMetadataByExprRequest.java | 126 +-
      .../src/gen/thrift/gen-php/metastore/Types.php | 30 -
      .../gen/thrift/gen-py/hive_metastore/ttypes.py | 26 +-
      .../gen/thrift/gen-rb/hive_metastore_types.rb | 13 +-
      .../hive/metastore/FileMetadataHandler.java | 30 -
      .../hadoop/hive/metastore/HiveMetaStore.java | 15 +-
      .../hadoop/hive/metastore/ObjectStore.java | 3 +-
      .../apache/hadoop/hive/metastore/RawStore.java | 8 +-
      .../filemeta/OrcFileMetadataHandler.java | 63 -
      .../hive/metastore/hbase/HBaseReadWrite.java | 2 +-
      .../hadoop/hive/metastore/hbase/HBaseStore.java | 41 +-
      .../DummyRawStoreControlledCommit.java | 3 +-
      .../DummyRawStoreForJdoConnection.java | 3 +-
      18 files changed, 1095 insertions(+), 1484 deletions(-)
    ----------------------------------------------------------------------


    http://git-wip-us.apache.org/repos/asf/hive/blob/3e0d87f8/metastore/if/hive_metastore.thrift
    ----------------------------------------------------------------------
    diff --git a/metastore/if/hive_metastore.thrift b/metastore/if/hive_metastore.thrift
    index 3e30f56..751cebe 100755
    --- a/metastore/if/hive_metastore.thrift
    +++ b/metastore/if/hive_metastore.thrift
    @@ -725,17 +725,11 @@ struct GetFileMetadataByExprResult {
        2: required bool isSupported
      }

    -enum FileMetadataExprType {
    - ORC_SARG = 1
    -}
    -
    -
      // Request type for get_file_metadata_by_expr
      struct GetFileMetadataByExprRequest {
        1: required list<i64> fileIds,
        2: required binary expr,
    - 3: optional bool doGetFooters,
    - 4: optional FileMetadataExprType type
    + 3: optional bool doGetFooters
      }

      // Return type for get_file_metadata

Related Discussions

Discussion Navigation
viewthread | post
Discussion Overview
groupcommits @
categorieshive, hadoop
postedOct 23, '15 at 11:58p
activeOct 23, '15 at 11:58p
posts3
users1
websitehive.apache.org

1 user in discussion

Sershe: 3 posts

People

Translate

site design / logo © 2021 Grokbase