http://git-wip-us.apache.org/repos/asf/hive/blob/1d46608e/standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h b/standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h index 5c6495e..68e34d5 100644 --- a/standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h +++ b/standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h @@ -185,6 +185,16 @@ struct SchemaVersionState { extern const std::map<int, const char*> _SchemaVersionState_VALUES_TO_NAMES; +struct IsolationLevelCompliance { + enum type { + YES = 1, + NO = 2, + UNKNOWN = 3 + }; +}; + +extern const std::map<int, const char*> _IsolationLevelCompliance_VALUES_TO_NAMES; + struct FunctionType { enum type { JAVA = 1 @@ -667,6 +677,10 @@ class RuntimeStat; class GetRuntimeStatsRequest; +class AlterPartitionsRequest; + +class AlterPartitionsResponse; + class MetaException; class UnknownTableException; @@ -3101,7 +3115,7 @@ inline std::ostream& operator<<(std::ostream& out, const StorageDescriptor& obj) } typedef struct _Table__isset { - _Table__isset() : tableName(false), dbName(false), owner(false), createTime(false), lastAccessTime(false), retention(false), sd(false), partitionKeys(false), parameters(false), viewOriginalText(false), viewExpandedText(false), tableType(false), privileges(false), temporary(true), rewriteEnabled(false), creationMetadata(false), catName(false), ownerType(true) {} + _Table__isset() : tableName(false), dbName(false), owner(false), createTime(false), lastAccessTime(false), retention(false), sd(false), partitionKeys(false), parameters(false), viewOriginalText(false), viewExpandedText(false), tableType(false), privileges(false), temporary(true), rewriteEnabled(false), creationMetadata(false), catName(false), ownerType(true), txnId(true), validWriteIdList(false), isStatsCompliant(false) {} bool tableName :1; bool dbName :1; bool owner :1; @@ -3120,6 +3134,9 @@ typedef struct _Table__isset { bool creationMetadata :1; bool catName :1; bool ownerType :1; + bool txnId :1; + bool validWriteIdList :1; + bool isStatsCompliant :1; } _Table__isset; class Table { @@ -3127,7 +3144,7 @@ class Table { Table(const Table&); Table& operator=(const Table&); - Table() : tableName(), dbName(), owner(), createTime(0), lastAccessTime(0), retention(0), viewOriginalText(), viewExpandedText(), tableType(), temporary(false), rewriteEnabled(0), catName(), ownerType((PrincipalType::type)1) { + Table() : tableName(), dbName(), owner(), createTime(0), lastAccessTime(0), retention(0), viewOriginalText(), viewExpandedText(), tableType(), temporary(false), rewriteEnabled(0), catName(), ownerType((PrincipalType::type)1), txnId(-1LL), validWriteIdList(), isStatsCompliant((IsolationLevelCompliance::type)0) { ownerType = (PrincipalType::type)1; } @@ -3151,6 +3168,9 @@ class Table { CreationMetadata creationMetadata; std::string catName; PrincipalType::type ownerType; + int64_t txnId; + std::string validWriteIdList; + IsolationLevelCompliance::type isStatsCompliant; _Table__isset __isset; @@ -3190,6 +3210,12 @@ class Table { void __set_ownerType(const PrincipalType::type val); + void __set_txnId(const int64_t val); + + void __set_validWriteIdList(const std::string& val); + + void __set_isStatsCompliant(const IsolationLevelCompliance::type val); + bool operator == (const Table & rhs) const { if (!(tableName == rhs.tableName)) @@ -3240,6 +3266,18 @@ class Table { return false; else if (__isset.ownerType && !(ownerType == rhs.ownerType)) return false; + if (__isset.txnId != rhs.__isset.txnId) + return false; + else if (__isset.txnId && !(txnId == rhs.txnId)) + return false; + if (__isset.validWriteIdList != rhs.__isset.validWriteIdList) + return false; + else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList)) + return false; + if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant) + return false; + else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant)) + return false; return true; } bool operator != (const Table &rhs) const { @@ -3263,7 +3301,7 @@ inline std::ostream& operator<<(std::ostream& out, const Table& obj) } typedef struct _Partition__isset { - _Partition__isset() : values(false), dbName(false), tableName(false), createTime(false), lastAccessTime(false), sd(false), parameters(false), privileges(false), catName(false) {} + _Partition__isset() : values(false), dbName(false), tableName(false), createTime(false), lastAccessTime(false), sd(false), parameters(false), privileges(false), catName(false), txnId(true), validWriteIdList(false), isStatsCompliant(false) {} bool values :1; bool dbName :1; bool tableName :1; @@ -3273,6 +3311,9 @@ typedef struct _Partition__isset { bool parameters :1; bool privileges :1; bool catName :1; + bool txnId :1; + bool validWriteIdList :1; + bool isStatsCompliant :1; } _Partition__isset; class Partition { @@ -3280,7 +3321,7 @@ class Partition { Partition(const Partition&); Partition& operator=(const Partition&); - Partition() : dbName(), tableName(), createTime(0), lastAccessTime(0), catName() { + Partition() : dbName(), tableName(), createTime(0), lastAccessTime(0), catName(), txnId(-1LL), validWriteIdList(), isStatsCompliant((IsolationLevelCompliance::type)0) { } virtual ~Partition() throw(); @@ -3293,6 +3334,9 @@ class Partition { std::map<std::string, std::string> parameters; PrincipalPrivilegeSet privileges; std::string catName; + int64_t txnId; + std::string validWriteIdList; + IsolationLevelCompliance::type isStatsCompliant; _Partition__isset __isset; @@ -3314,6 +3358,12 @@ class Partition { void __set_catName(const std::string& val); + void __set_txnId(const int64_t val); + + void __set_validWriteIdList(const std::string& val); + + void __set_isStatsCompliant(const IsolationLevelCompliance::type val); + bool operator == (const Partition & rhs) const { if (!(values == rhs.values)) @@ -3338,6 +3388,18 @@ class Partition { return false; else if (__isset.catName && !(catName == rhs.catName)) return false; + if (__isset.txnId != rhs.__isset.txnId) + return false; + else if (__isset.txnId && !(txnId == rhs.txnId)) + return false; + if (__isset.validWriteIdList != rhs.__isset.validWriteIdList) + return false; + else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList)) + return false; + if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant) + return false; + else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant)) + return false; return true; } bool operator != (const Partition &rhs) const { @@ -3537,13 +3599,16 @@ inline std::ostream& operator<<(std::ostream& out, const PartitionListComposingS } typedef struct _PartitionSpec__isset { - _PartitionSpec__isset() : dbName(false), tableName(false), rootPath(false), sharedSDPartitionSpec(false), partitionList(false), catName(false) {} + _PartitionSpec__isset() : dbName(false), tableName(false), rootPath(false), sharedSDPartitionSpec(false), partitionList(false), catName(false), txnId(true), validWriteIdList(false), isStatsCompliant(false) {} bool dbName :1; bool tableName :1; bool rootPath :1; bool sharedSDPartitionSpec :1; bool partitionList :1; bool catName :1; + bool txnId :1; + bool validWriteIdList :1; + bool isStatsCompliant :1; } _PartitionSpec__isset; class PartitionSpec { @@ -3551,7 +3616,7 @@ class PartitionSpec { PartitionSpec(const PartitionSpec&); PartitionSpec& operator=(const PartitionSpec&); - PartitionSpec() : dbName(), tableName(), rootPath(), catName() { + PartitionSpec() : dbName(), tableName(), rootPath(), catName(), txnId(-1LL), validWriteIdList(), isStatsCompliant((IsolationLevelCompliance::type)0) { } virtual ~PartitionSpec() throw(); @@ -3561,6 +3626,9 @@ class PartitionSpec { PartitionSpecWithSharedSD sharedSDPartitionSpec; PartitionListComposingSpec partitionList; std::string catName; + int64_t txnId; + std::string validWriteIdList; + IsolationLevelCompliance::type isStatsCompliant; _PartitionSpec__isset __isset; @@ -3576,6 +3644,12 @@ class PartitionSpec { void __set_catName(const std::string& val); + void __set_txnId(const int64_t val); + + void __set_validWriteIdList(const std::string& val); + + void __set_isStatsCompliant(const IsolationLevelCompliance::type val); + bool operator == (const PartitionSpec & rhs) const { if (!(dbName == rhs.dbName)) @@ -3596,6 +3670,18 @@ class PartitionSpec { return false; else if (__isset.catName && !(catName == rhs.catName)) return false; + if (__isset.txnId != rhs.__isset.txnId) + return false; + else if (__isset.txnId && !(txnId == rhs.txnId)) + return false; + if (__isset.validWriteIdList != rhs.__isset.validWriteIdList) + return false; + else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList)) + return false; + if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant) + return false; + else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant)) + return false; return true; } bool operator != (const PartitionSpec &rhs) const { @@ -4404,29 +4490,58 @@ inline std::ostream& operator<<(std::ostream& out, const ColumnStatisticsDesc& o return out; } +typedef struct _ColumnStatistics__isset { + _ColumnStatistics__isset() : txnId(true), validWriteIdList(false), isStatsCompliant(false) {} + bool txnId :1; + bool validWriteIdList :1; + bool isStatsCompliant :1; +} _ColumnStatistics__isset; class ColumnStatistics { public: ColumnStatistics(const ColumnStatistics&); ColumnStatistics& operator=(const ColumnStatistics&); - ColumnStatistics() { + ColumnStatistics() : txnId(-1LL), validWriteIdList(), isStatsCompliant((IsolationLevelCompliance::type)0) { } virtual ~ColumnStatistics() throw(); ColumnStatisticsDesc statsDesc; std::vector<ColumnStatisticsObj> statsObj; + int64_t txnId; + std::string validWriteIdList; + IsolationLevelCompliance::type isStatsCompliant; + + _ColumnStatistics__isset __isset; void __set_statsDesc(const ColumnStatisticsDesc& val); void __set_statsObj(const std::vector<ColumnStatisticsObj> & val); + void __set_txnId(const int64_t val); + + void __set_validWriteIdList(const std::string& val); + + void __set_isStatsCompliant(const IsolationLevelCompliance::type val); + bool operator == (const ColumnStatistics & rhs) const { if (!(statsDesc == rhs.statsDesc)) return false; if (!(statsObj == rhs.statsObj)) return false; + if (__isset.txnId != rhs.__isset.txnId) + return false; + else if (__isset.txnId && !(txnId == rhs.txnId)) + return false; + if (__isset.validWriteIdList != rhs.__isset.validWriteIdList) + return false; + else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList)) + return false; + if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant) + return false; + else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant)) + return false; return true; } bool operator != (const ColumnStatistics &rhs) const { @@ -4449,29 +4564,42 @@ inline std::ostream& operator<<(std::ostream& out, const ColumnStatistics& obj) return out; } +typedef struct _AggrStats__isset { + _AggrStats__isset() : isStatsCompliant(false) {} + bool isStatsCompliant :1; +} _AggrStats__isset; class AggrStats { public: AggrStats(const AggrStats&); AggrStats& operator=(const AggrStats&); - AggrStats() : partsFound(0) { + AggrStats() : partsFound(0), isStatsCompliant((IsolationLevelCompliance::type)0) { } virtual ~AggrStats() throw(); std::vector<ColumnStatisticsObj> colStats; int64_t partsFound; + IsolationLevelCompliance::type isStatsCompliant; + + _AggrStats__isset __isset; void __set_colStats(const std::vector<ColumnStatisticsObj> & val); void __set_partsFound(const int64_t val); + void __set_isStatsCompliant(const IsolationLevelCompliance::type val); + bool operator == (const AggrStats & rhs) const { if (!(colStats == rhs.colStats)) return false; if (!(partsFound == rhs.partsFound)) return false; + if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant) + return false; + else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant)) + return false; return true; } bool operator != (const AggrStats &rhs) const { @@ -4495,8 +4623,10 @@ inline std::ostream& operator<<(std::ostream& out, const AggrStats& obj) } typedef struct _SetPartitionsStatsRequest__isset { - _SetPartitionsStatsRequest__isset() : needMerge(false) {} + _SetPartitionsStatsRequest__isset() : needMerge(false), txnId(true), validWriteIdList(false) {} bool needMerge :1; + bool txnId :1; + bool validWriteIdList :1; } _SetPartitionsStatsRequest__isset; class SetPartitionsStatsRequest { @@ -4504,12 +4634,14 @@ class SetPartitionsStatsRequest { SetPartitionsStatsRequest(const SetPartitionsStatsRequest&); SetPartitionsStatsRequest& operator=(const SetPartitionsStatsRequest&); - SetPartitionsStatsRequest() : needMerge(0) { + SetPartitionsStatsRequest() : needMerge(0), txnId(-1LL), validWriteIdList() { } virtual ~SetPartitionsStatsRequest() throw(); std::vector<ColumnStatistics> colStats; bool needMerge; + int64_t txnId; + std::string validWriteIdList; _SetPartitionsStatsRequest__isset __isset; @@ -4517,6 +4649,10 @@ class SetPartitionsStatsRequest { void __set_needMerge(const bool val); + void __set_txnId(const int64_t val); + + void __set_validWriteIdList(const std::string& val); + bool operator == (const SetPartitionsStatsRequest & rhs) const { if (!(colStats == rhs.colStats)) @@ -4525,6 +4661,14 @@ class SetPartitionsStatsRequest { return false; else if (__isset.needMerge && !(needMerge == rhs.needMerge)) return false; + if (__isset.txnId != rhs.__isset.txnId) + return false; + else if (__isset.txnId && !(txnId == rhs.txnId)) + return false; + if (__isset.validWriteIdList != rhs.__isset.validWriteIdList) + return false; + else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList)) + return false; return true; } bool operator != (const SetPartitionsStatsRequest &rhs) const { @@ -5642,24 +5786,37 @@ inline std::ostream& operator<<(std::ostream& out, const PartitionsByExprRequest return out; } +typedef struct _TableStatsResult__isset { + _TableStatsResult__isset() : isStatsCompliant(false) {} + bool isStatsCompliant :1; +} _TableStatsResult__isset; class TableStatsResult { public: TableStatsResult(const TableStatsResult&); TableStatsResult& operator=(const TableStatsResult&); - TableStatsResult() { + TableStatsResult() : isStatsCompliant((IsolationLevelCompliance::type)0) { } virtual ~TableStatsResult() throw(); std::vector<ColumnStatisticsObj> tableStats; + IsolationLevelCompliance::type isStatsCompliant; + + _TableStatsResult__isset __isset; void __set_tableStats(const std::vector<ColumnStatisticsObj> & val); + void __set_isStatsCompliant(const IsolationLevelCompliance::type val); + bool operator == (const TableStatsResult & rhs) const { if (!(tableStats == rhs.tableStats)) return false; + if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant) + return false; + else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant)) + return false; return true; } bool operator != (const TableStatsResult &rhs) const { @@ -5682,24 +5839,37 @@ inline std::ostream& operator<<(std::ostream& out, const TableStatsResult& obj) return out; } +typedef struct _PartitionsStatsResult__isset { + _PartitionsStatsResult__isset() : isStatsCompliant(false) {} + bool isStatsCompliant :1; +} _PartitionsStatsResult__isset; class PartitionsStatsResult { public: PartitionsStatsResult(const PartitionsStatsResult&); PartitionsStatsResult& operator=(const PartitionsStatsResult&); - PartitionsStatsResult() { + PartitionsStatsResult() : isStatsCompliant((IsolationLevelCompliance::type)0) { } virtual ~PartitionsStatsResult() throw(); std::map<std::string, std::vector<ColumnStatisticsObj> > partStats; + IsolationLevelCompliance::type isStatsCompliant; + + _PartitionsStatsResult__isset __isset; void __set_partStats(const std::map<std::string, std::vector<ColumnStatisticsObj> > & val); + void __set_isStatsCompliant(const IsolationLevelCompliance::type val); + bool operator == (const PartitionsStatsResult & rhs) const { if (!(partStats == rhs.partStats)) return false; + if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant) + return false; + else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant)) + return false; return true; } bool operator != (const PartitionsStatsResult &rhs) const { @@ -5723,8 +5893,10 @@ inline std::ostream& operator<<(std::ostream& out, const PartitionsStatsResult& } typedef struct _TableStatsRequest__isset { - _TableStatsRequest__isset() : catName(false) {} + _TableStatsRequest__isset() : catName(false), txnId(true), validWriteIdList(false) {} bool catName :1; + bool txnId :1; + bool validWriteIdList :1; } _TableStatsRequest__isset; class TableStatsRequest { @@ -5732,7 +5904,7 @@ class TableStatsRequest { TableStatsRequest(const TableStatsRequest&); TableStatsRequest& operator=(const TableStatsRequest&); - TableStatsRequest() : dbName(), tblName(), catName() { + TableStatsRequest() : dbName(), tblName(), catName(), txnId(-1LL), validWriteIdList() { } virtual ~TableStatsRequest() throw(); @@ -5740,6 +5912,8 @@ class TableStatsRequest { std::string tblName; std::vector<std::string> colNames; std::string catName; + int64_t txnId; + std::string validWriteIdList; _TableStatsRequest__isset __isset; @@ -5751,6 +5925,10 @@ class TableStatsRequest { void __set_catName(const std::string& val); + void __set_txnId(const int64_t val); + + void __set_validWriteIdList(const std::string& val); + bool operator == (const TableStatsRequest & rhs) const { if (!(dbName == rhs.dbName)) @@ -5763,6 +5941,14 @@ class TableStatsRequest { return false; else if (__isset.catName && !(catName == rhs.catName)) return false; + if (__isset.txnId != rhs.__isset.txnId) + return false; + else if (__isset.txnId && !(txnId == rhs.txnId)) + return false; + if (__isset.validWriteIdList != rhs.__isset.validWriteIdList) + return false; + else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList)) + return false; return true; } bool operator != (const TableStatsRequest &rhs) const { @@ -5786,8 +5972,10 @@ inline std::ostream& operator<<(std::ostream& out, const TableStatsRequest& obj) } typedef struct _PartitionsStatsRequest__isset { - _PartitionsStatsRequest__isset() : catName(false) {} + _PartitionsStatsRequest__isset() : catName(false), txnId(true), validWriteIdList(false) {} bool catName :1; + bool txnId :1; + bool validWriteIdList :1; } _PartitionsStatsRequest__isset; class PartitionsStatsRequest { @@ -5795,7 +5983,7 @@ class PartitionsStatsRequest { PartitionsStatsRequest(const PartitionsStatsRequest&); PartitionsStatsRequest& operator=(const PartitionsStatsRequest&); - PartitionsStatsRequest() : dbName(), tblName(), catName() { + PartitionsStatsRequest() : dbName(), tblName(), catName(), txnId(-1LL), validWriteIdList() { } virtual ~PartitionsStatsRequest() throw(); @@ -5804,6 +5992,8 @@ class PartitionsStatsRequest { std::vector<std::string> colNames; std::vector<std::string> partNames; std::string catName; + int64_t txnId; + std::string validWriteIdList; _PartitionsStatsRequest__isset __isset; @@ -5817,6 +6007,10 @@ class PartitionsStatsRequest { void __set_catName(const std::string& val); + void __set_txnId(const int64_t val); + + void __set_validWriteIdList(const std::string& val); + bool operator == (const PartitionsStatsRequest & rhs) const { if (!(dbName == rhs.dbName)) @@ -5831,6 +6025,14 @@ class PartitionsStatsRequest { return false; else if (__isset.catName && !(catName == rhs.catName)) return false; + if (__isset.txnId != rhs.__isset.txnId) + return false; + else if (__isset.txnId && !(txnId == rhs.txnId)) + return false; + if (__isset.validWriteIdList != rhs.__isset.validWriteIdList) + return false; + else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList)) + return false; return true; } bool operator != (const PartitionsStatsRequest &rhs) const { @@ -5854,8 +6056,9 @@ inline std::ostream& operator<<(std::ostream& out, const PartitionsStatsRequest& } typedef struct _AddPartitionsResult__isset { - _AddPartitionsResult__isset() : partitions(false) {} + _AddPartitionsResult__isset() : partitions(false), isStatsCompliant(false) {} bool partitions :1; + bool isStatsCompliant :1; } _AddPartitionsResult__isset; class AddPartitionsResult { @@ -5863,22 +6066,29 @@ class AddPartitionsResult { AddPartitionsResult(const AddPartitionsResult&); AddPartitionsResult& operator=(const AddPartitionsResult&); - AddPartitionsResult() { + AddPartitionsResult() : isStatsCompliant((IsolationLevelCompliance::type)0) { } virtual ~AddPartitionsResult() throw(); std::vector<Partition> partitions; + IsolationLevelCompliance::type isStatsCompliant; _AddPartitionsResult__isset __isset; void __set_partitions(const std::vector<Partition> & val); + void __set_isStatsCompliant(const IsolationLevelCompliance::type val); + bool operator == (const AddPartitionsResult & rhs) const { if (__isset.partitions != rhs.__isset.partitions) return false; else if (__isset.partitions && !(partitions == rhs.partitions)) return false; + if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant) + return false; + else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant)) + return false; return true; } bool operator != (const AddPartitionsResult &rhs) const { @@ -5902,9 +6112,11 @@ inline std::ostream& operator<<(std::ostream& out, const AddPartitionsResult& ob } typedef struct _AddPartitionsRequest__isset { - _AddPartitionsRequest__isset() : needResult(true), catName(false) {} + _AddPartitionsRequest__isset() : needResult(true), catName(false), txnId(true), validWriteIdList(false) {} bool needResult :1; bool catName :1; + bool txnId :1; + bool validWriteIdList :1; } _AddPartitionsRequest__isset; class AddPartitionsRequest { @@ -5912,7 +6124,7 @@ class AddPartitionsRequest { AddPartitionsRequest(const AddPartitionsRequest&); AddPartitionsRequest& operator=(const AddPartitionsRequest&); - AddPartitionsRequest() : dbName(), tblName(), ifNotExists(0), needResult(true), catName() { + AddPartitionsRequest() : dbName(), tblName(), ifNotExists(0), needResult(true), catName(), txnId(-1LL), validWriteIdList() { } virtual ~AddPartitionsRequest() throw(); @@ -5922,6 +6134,8 @@ class AddPartitionsRequest { bool ifNotExists; bool needResult; std::string catName; + int64_t txnId; + std::string validWriteIdList; _AddPartitionsRequest__isset __isset; @@ -5937,6 +6151,10 @@ class AddPartitionsRequest { void __set_catName(const std::string& val); + void __set_txnId(const int64_t val); + + void __set_validWriteIdList(const std::string& val); + bool operator == (const AddPartitionsRequest & rhs) const { if (!(dbName == rhs.dbName)) @@ -5955,6 +6173,14 @@ class AddPartitionsRequest { return false; else if (__isset.catName && !(catName == rhs.catName)) return false; + if (__isset.txnId != rhs.__isset.txnId) + return false; + else if (__isset.txnId && !(txnId == rhs.txnId)) + return false; + if (__isset.validWriteIdList != rhs.__isset.validWriteIdList) + return false; + else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList)) + return false; return true; } bool operator != (const AddPartitionsRequest &rhs) const { @@ -9873,9 +10099,11 @@ inline std::ostream& operator<<(std::ostream& out, const ClientCapabilities& obj } typedef struct _GetTableRequest__isset { - _GetTableRequest__isset() : capabilities(false), catName(false) {} + _GetTableRequest__isset() : capabilities(false), catName(false), txnId(true), validWriteIdList(false) {} bool capabilities :1; bool catName :1; + bool txnId :1; + bool validWriteIdList :1; } _GetTableRequest__isset; class GetTableRequest { @@ -9883,7 +10111,7 @@ class GetTableRequest { GetTableRequest(const GetTableRequest&); GetTableRequest& operator=(const GetTableRequest&); - GetTableRequest() : dbName(), tblName(), catName() { + GetTableRequest() : dbName(), tblName(), catName(), txnId(-1LL), validWriteIdList() { } virtual ~GetTableRequest() throw(); @@ -9891,6 +10119,8 @@ class GetTableRequest { std::string tblName; ClientCapabilities capabilities; std::string catName; + int64_t txnId; + std::string validWriteIdList; _GetTableRequest__isset __isset; @@ -9902,6 +10132,10 @@ class GetTableRequest { void __set_catName(const std::string& val); + void __set_txnId(const int64_t val); + + void __set_validWriteIdList(const std::string& val); + bool operator == (const GetTableRequest & rhs) const { if (!(dbName == rhs.dbName)) @@ -9916,6 +10150,14 @@ class GetTableRequest { return false; else if (__isset.catName && !(catName == rhs.catName)) return false; + if (__isset.txnId != rhs.__isset.txnId) + return false; + else if (__isset.txnId && !(txnId == rhs.txnId)) + return false; + if (__isset.validWriteIdList != rhs.__isset.validWriteIdList) + return false; + else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList)) + return false; return true; } bool operator != (const GetTableRequest &rhs) const { @@ -9938,24 +10180,37 @@ inline std::ostream& operator<<(std::ostream& out, const GetTableRequest& obj) return out; } +typedef struct _GetTableResult__isset { + _GetTableResult__isset() : isStatsCompliant(false) {} + bool isStatsCompliant :1; +} _GetTableResult__isset; class GetTableResult { public: GetTableResult(const GetTableResult&); GetTableResult& operator=(const GetTableResult&); - GetTableResult() { + GetTableResult() : isStatsCompliant((IsolationLevelCompliance::type)0) { } virtual ~GetTableResult() throw(); Table table; + IsolationLevelCompliance::type isStatsCompliant; + + _GetTableResult__isset __isset; void __set_table(const Table& val); + void __set_isStatsCompliant(const IsolationLevelCompliance::type val); + bool operator == (const GetTableResult & rhs) const { if (!(table == rhs.table)) return false; + if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant) + return false; + else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant)) + return false; return true; } bool operator != (const GetTableResult &rhs) const { @@ -13186,6 +13441,117 @@ inline std::ostream& operator<<(std::ostream& out, const GetRuntimeStatsRequest& return out; } +typedef struct _AlterPartitionsRequest__isset { + _AlterPartitionsRequest__isset() : txnId(true), validWriteIdList(false) {} + bool txnId :1; + bool validWriteIdList :1; +} _AlterPartitionsRequest__isset; + +class AlterPartitionsRequest { + public: + + AlterPartitionsRequest(const AlterPartitionsRequest&); + AlterPartitionsRequest& operator=(const AlterPartitionsRequest&); + AlterPartitionsRequest() : dbName(), tableName(), txnId(-1LL), validWriteIdList() { + } + + virtual ~AlterPartitionsRequest() throw(); + std::string dbName; + std::string tableName; + std::vector<Partition> partitions; + EnvironmentContext environmentContext; + int64_t txnId; + std::string validWriteIdList; + + _AlterPartitionsRequest__isset __isset; + + void __set_dbName(const std::string& val); + + void __set_tableName(const std::string& val); + + void __set_partitions(const std::vector<Partition> & val); + + void __set_environmentContext(const EnvironmentContext& val); + + void __set_txnId(const int64_t val); + + void __set_validWriteIdList(const std::string& val); + + bool operator == (const AlterPartitionsRequest & rhs) const + { + if (!(dbName == rhs.dbName)) + return false; + if (!(tableName == rhs.tableName)) + return false; + if (!(partitions == rhs.partitions)) + return false; + if (!(environmentContext == rhs.environmentContext)) + return false; + if (__isset.txnId != rhs.__isset.txnId) + return false; + else if (__isset.txnId && !(txnId == rhs.txnId)) + return false; + if (__isset.validWriteIdList != rhs.__isset.validWriteIdList) + return false; + else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList)) + return false; + return true; + } + bool operator != (const AlterPartitionsRequest &rhs) const { + return !(*this == rhs); + } + + bool operator < (const AlterPartitionsRequest & ) const; + + uint32_t read(::apache::thrift::protocol::TProtocol* iprot); + uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; + + virtual void printTo(std::ostream& out) const; +}; + +void swap(AlterPartitionsRequest &a, AlterPartitionsRequest &b); + +inline std::ostream& operator<<(std::ostream& out, const AlterPartitionsRequest& obj) +{ + obj.printTo(out); + return out; +} + + +class AlterPartitionsResponse { + public: + + AlterPartitionsResponse(const AlterPartitionsResponse&); + AlterPartitionsResponse& operator=(const AlterPartitionsResponse&); + AlterPartitionsResponse() { + } + + virtual ~AlterPartitionsResponse() throw(); + + bool operator == (const AlterPartitionsResponse & /* rhs */) const + { + return true; + } + bool operator != (const AlterPartitionsResponse &rhs) const { + return !(*this == rhs); + } + + bool operator < (const AlterPartitionsResponse & ) const; + + uint32_t read(::apache::thrift::protocol::TProtocol* iprot); + uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; + + virtual void printTo(std::ostream& out) const; +}; + +void swap(AlterPartitionsResponse &a, AlterPartitionsResponse &b); + +inline std::ostream& operator<<(std::ostream& out, const AlterPartitionsResponse& obj) +{ + obj.printTo(out); + return out; +} + typedef struct _MetaException__isset { _MetaException__isset() : message(false) {} bool message :1;
http://git-wip-us.apache.org/repos/asf/hive/blob/1d46608e/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsRequest.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsRequest.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsRequest.java index dd3a127..56e5043 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsRequest.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsRequest.java @@ -44,6 +44,8 @@ import org.slf4j.LoggerFactory; private static final org.apache.thrift.protocol.TField IF_NOT_EXISTS_FIELD_DESC = new org.apache.thrift.protocol.TField("ifNotExists", org.apache.thrift.protocol.TType.BOOL, (short)4); private static final org.apache.thrift.protocol.TField NEED_RESULT_FIELD_DESC = new org.apache.thrift.protocol.TField("needResult", org.apache.thrift.protocol.TType.BOOL, (short)5); private static final org.apache.thrift.protocol.TField CAT_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("catName", org.apache.thrift.protocol.TType.STRING, (short)6); + private static final org.apache.thrift.protocol.TField TXN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("txnId", org.apache.thrift.protocol.TType.I64, (short)7); + private static final org.apache.thrift.protocol.TField VALID_WRITE_ID_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("validWriteIdList", org.apache.thrift.protocol.TType.STRING, (short)8); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -57,6 +59,8 @@ import org.slf4j.LoggerFactory; private boolean ifNotExists; // required private boolean needResult; // optional private String catName; // optional + private long txnId; // optional + private String validWriteIdList; // 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 { @@ -65,7 +69,9 @@ import org.slf4j.LoggerFactory; PARTS((short)3, "parts"), IF_NOT_EXISTS((short)4, "ifNotExists"), NEED_RESULT((short)5, "needResult"), - CAT_NAME((short)6, "catName"); + CAT_NAME((short)6, "catName"), + TXN_ID((short)7, "txnId"), + VALID_WRITE_ID_LIST((short)8, "validWriteIdList"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -92,6 +98,10 @@ import org.slf4j.LoggerFactory; return NEED_RESULT; case 6: // CAT_NAME return CAT_NAME; + case 7: // TXN_ID + return TXN_ID; + case 8: // VALID_WRITE_ID_LIST + return VALID_WRITE_ID_LIST; default: return null; } @@ -134,8 +144,9 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __IFNOTEXISTS_ISSET_ID = 0; private static final int __NEEDRESULT_ISSET_ID = 1; + private static final int __TXNID_ISSET_ID = 2; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.NEED_RESULT,_Fields.CAT_NAME}; + private static final _Fields optionals[] = {_Fields.NEED_RESULT,_Fields.CAT_NAME,_Fields.TXN_ID,_Fields.VALID_WRITE_ID_LIST}; 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); @@ -152,6 +163,10 @@ import org.slf4j.LoggerFactory; new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); tmpMap.put(_Fields.CAT_NAME, new org.apache.thrift.meta_data.FieldMetaData("catName", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TXN_ID, new org.apache.thrift.meta_data.FieldMetaData("txnId", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); + tmpMap.put(_Fields.VALID_WRITE_ID_LIST, new org.apache.thrift.meta_data.FieldMetaData("validWriteIdList", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AddPartitionsRequest.class, metaDataMap); } @@ -159,6 +174,8 @@ import org.slf4j.LoggerFactory; public AddPartitionsRequest() { this.needResult = true; + this.txnId = -1L; + } public AddPartitionsRequest( @@ -198,6 +215,10 @@ import org.slf4j.LoggerFactory; if (other.isSetCatName()) { this.catName = other.catName; } + this.txnId = other.txnId; + if (other.isSetValidWriteIdList()) { + this.validWriteIdList = other.validWriteIdList; + } } public AddPartitionsRequest deepCopy() { @@ -214,6 +235,9 @@ import org.slf4j.LoggerFactory; this.needResult = true; this.catName = null; + this.txnId = -1L; + + this.validWriteIdList = null; } public String getDbName() { @@ -367,6 +391,51 @@ import org.slf4j.LoggerFactory; } } + public long getTxnId() { + return this.txnId; + } + + public void setTxnId(long txnId) { + this.txnId = txnId; + setTxnIdIsSet(true); + } + + public void unsetTxnId() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TXNID_ISSET_ID); + } + + /** Returns true if field txnId is set (has been assigned a value) and false otherwise */ + public boolean isSetTxnId() { + return EncodingUtils.testBit(__isset_bitfield, __TXNID_ISSET_ID); + } + + public void setTxnIdIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TXNID_ISSET_ID, value); + } + + public String getValidWriteIdList() { + return this.validWriteIdList; + } + + public void setValidWriteIdList(String validWriteIdList) { + this.validWriteIdList = validWriteIdList; + } + + public void unsetValidWriteIdList() { + this.validWriteIdList = null; + } + + /** Returns true if field validWriteIdList is set (has been assigned a value) and false otherwise */ + public boolean isSetValidWriteIdList() { + return this.validWriteIdList != null; + } + + public void setValidWriteIdListIsSet(boolean value) { + if (!value) { + this.validWriteIdList = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case DB_NAME: @@ -417,6 +486,22 @@ import org.slf4j.LoggerFactory; } break; + case TXN_ID: + if (value == null) { + unsetTxnId(); + } else { + setTxnId((Long)value); + } + break; + + case VALID_WRITE_ID_LIST: + if (value == null) { + unsetValidWriteIdList(); + } else { + setValidWriteIdList((String)value); + } + break; + } } @@ -440,6 +525,12 @@ import org.slf4j.LoggerFactory; case CAT_NAME: return getCatName(); + case TXN_ID: + return getTxnId(); + + case VALID_WRITE_ID_LIST: + return getValidWriteIdList(); + } throw new IllegalStateException(); } @@ -463,6 +554,10 @@ import org.slf4j.LoggerFactory; return isSetNeedResult(); case CAT_NAME: return isSetCatName(); + case TXN_ID: + return isSetTxnId(); + case VALID_WRITE_ID_LIST: + return isSetValidWriteIdList(); } throw new IllegalStateException(); } @@ -534,6 +629,24 @@ import org.slf4j.LoggerFactory; return false; } + boolean this_present_txnId = true && this.isSetTxnId(); + boolean that_present_txnId = true && that.isSetTxnId(); + if (this_present_txnId || that_present_txnId) { + if (!(this_present_txnId && that_present_txnId)) + return false; + if (this.txnId != that.txnId) + return false; + } + + boolean this_present_validWriteIdList = true && this.isSetValidWriteIdList(); + boolean that_present_validWriteIdList = true && that.isSetValidWriteIdList(); + if (this_present_validWriteIdList || that_present_validWriteIdList) { + if (!(this_present_validWriteIdList && that_present_validWriteIdList)) + return false; + if (!this.validWriteIdList.equals(that.validWriteIdList)) + return false; + } + return true; } @@ -571,6 +684,16 @@ import org.slf4j.LoggerFactory; if (present_catName) list.add(catName); + boolean present_txnId = true && (isSetTxnId()); + list.add(present_txnId); + if (present_txnId) + list.add(txnId); + + boolean present_validWriteIdList = true && (isSetValidWriteIdList()); + list.add(present_validWriteIdList); + if (present_validWriteIdList) + list.add(validWriteIdList); + return list.hashCode(); } @@ -642,6 +765,26 @@ import org.slf4j.LoggerFactory; return lastComparison; } } + lastComparison = Boolean.valueOf(isSetTxnId()).compareTo(other.isSetTxnId()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetTxnId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.txnId, other.txnId); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetValidWriteIdList()).compareTo(other.isSetValidWriteIdList()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetValidWriteIdList()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.validWriteIdList, other.validWriteIdList); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -705,6 +848,22 @@ import org.slf4j.LoggerFactory; } first = false; } + if (isSetTxnId()) { + if (!first) sb.append(", "); + sb.append("txnId:"); + sb.append(this.txnId); + first = false; + } + if (isSetValidWriteIdList()) { + if (!first) sb.append(", "); + sb.append("validWriteIdList:"); + if (this.validWriteIdList == null) { + sb.append("null"); + } else { + sb.append(this.validWriteIdList); + } + first = false; + } sb.append(")"); return sb.toString(); } @@ -825,6 +984,22 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 7: // TXN_ID + if (schemeField.type == org.apache.thrift.protocol.TType.I64) { + struct.txnId = iprot.readI64(); + struct.setTxnIdIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 8: // VALID_WRITE_ID_LIST + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.validWriteIdList = iprot.readString(); + struct.setValidWriteIdListIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -875,6 +1050,18 @@ import org.slf4j.LoggerFactory; oprot.writeFieldEnd(); } } + if (struct.isSetTxnId()) { + oprot.writeFieldBegin(TXN_ID_FIELD_DESC); + oprot.writeI64(struct.txnId); + oprot.writeFieldEnd(); + } + if (struct.validWriteIdList != null) { + if (struct.isSetValidWriteIdList()) { + oprot.writeFieldBegin(VALID_WRITE_ID_LIST_FIELD_DESC); + oprot.writeString(struct.validWriteIdList); + oprot.writeFieldEnd(); + } + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -909,13 +1096,25 @@ import org.slf4j.LoggerFactory; if (struct.isSetCatName()) { optionals.set(1); } - oprot.writeBitSet(optionals, 2); + if (struct.isSetTxnId()) { + optionals.set(2); + } + if (struct.isSetValidWriteIdList()) { + optionals.set(3); + } + oprot.writeBitSet(optionals, 4); if (struct.isSetNeedResult()) { oprot.writeBool(struct.needResult); } if (struct.isSetCatName()) { oprot.writeString(struct.catName); } + if (struct.isSetTxnId()) { + oprot.writeI64(struct.txnId); + } + if (struct.isSetValidWriteIdList()) { + oprot.writeString(struct.validWriteIdList); + } } @Override @@ -939,7 +1138,7 @@ import org.slf4j.LoggerFactory; struct.setPartsIsSet(true); struct.ifNotExists = iprot.readBool(); struct.setIfNotExistsIsSet(true); - BitSet incoming = iprot.readBitSet(2); + BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { struct.needResult = iprot.readBool(); struct.setNeedResultIsSet(true); @@ -948,6 +1147,14 @@ import org.slf4j.LoggerFactory; struct.catName = iprot.readString(); struct.setCatNameIsSet(true); } + if (incoming.get(2)) { + struct.txnId = iprot.readI64(); + struct.setTxnIdIsSet(true); + } + if (incoming.get(3)) { + struct.validWriteIdList = iprot.readString(); + struct.setValidWriteIdListIsSet(true); + } } } http://git-wip-us.apache.org/repos/asf/hive/blob/1d46608e/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsResult.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsResult.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsResult.java index fe41b8c..03d1fc4 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsResult.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsResult.java @@ -39,6 +39,7 @@ import org.slf4j.LoggerFactory; private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AddPartitionsResult"); private static final org.apache.thrift.protocol.TField PARTITIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("partitions", org.apache.thrift.protocol.TType.LIST, (short)1); + private static final org.apache.thrift.protocol.TField IS_STATS_COMPLIANT_FIELD_DESC = new org.apache.thrift.protocol.TField("isStatsCompliant", org.apache.thrift.protocol.TType.I32, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -47,10 +48,16 @@ import org.slf4j.LoggerFactory; } private List<Partition> partitions; // optional + private IsolationLevelCompliance isStatsCompliant; // 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 { - PARTITIONS((short)1, "partitions"); + PARTITIONS((short)1, "partitions"), + /** + * + * @see IsolationLevelCompliance + */ + IS_STATS_COMPLIANT((short)2, "isStatsCompliant"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -67,6 +74,8 @@ import org.slf4j.LoggerFactory; switch(fieldId) { case 1: // PARTITIONS return PARTITIONS; + case 2: // IS_STATS_COMPLIANT + return IS_STATS_COMPLIANT; default: return null; } @@ -107,13 +116,15 @@ import org.slf4j.LoggerFactory; } // isset id assignments - private static final _Fields optionals[] = {_Fields.PARTITIONS}; + private static final _Fields optionals[] = {_Fields.PARTITIONS,_Fields.IS_STATS_COMPLIANT}; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.PARTITIONS, new org.apache.thrift.meta_data.FieldMetaData("partitions", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Partition.class)))); + tmpMap.put(_Fields.IS_STATS_COMPLIANT, new org.apache.thrift.meta_data.FieldMetaData("isStatsCompliant", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, IsolationLevelCompliance.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AddPartitionsResult.class, metaDataMap); } @@ -132,6 +143,9 @@ import org.slf4j.LoggerFactory; } this.partitions = __this__partitions; } + if (other.isSetIsStatsCompliant()) { + this.isStatsCompliant = other.isStatsCompliant; + } } public AddPartitionsResult deepCopy() { @@ -141,6 +155,7 @@ import org.slf4j.LoggerFactory; @Override public void clear() { this.partitions = null; + this.isStatsCompliant = null; } public int getPartitionsSize() { @@ -181,6 +196,37 @@ import org.slf4j.LoggerFactory; } } + /** + * + * @see IsolationLevelCompliance + */ + public IsolationLevelCompliance getIsStatsCompliant() { + return this.isStatsCompliant; + } + + /** + * + * @see IsolationLevelCompliance + */ + public void setIsStatsCompliant(IsolationLevelCompliance isStatsCompliant) { + this.isStatsCompliant = isStatsCompliant; + } + + public void unsetIsStatsCompliant() { + this.isStatsCompliant = null; + } + + /** Returns true if field isStatsCompliant is set (has been assigned a value) and false otherwise */ + public boolean isSetIsStatsCompliant() { + return this.isStatsCompliant != null; + } + + public void setIsStatsCompliantIsSet(boolean value) { + if (!value) { + this.isStatsCompliant = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case PARTITIONS: @@ -191,6 +237,14 @@ import org.slf4j.LoggerFactory; } break; + case IS_STATS_COMPLIANT: + if (value == null) { + unsetIsStatsCompliant(); + } else { + setIsStatsCompliant((IsolationLevelCompliance)value); + } + break; + } } @@ -199,6 +253,9 @@ import org.slf4j.LoggerFactory; case PARTITIONS: return getPartitions(); + case IS_STATS_COMPLIANT: + return getIsStatsCompliant(); + } throw new IllegalStateException(); } @@ -212,6 +269,8 @@ import org.slf4j.LoggerFactory; switch (field) { case PARTITIONS: return isSetPartitions(); + case IS_STATS_COMPLIANT: + return isSetIsStatsCompliant(); } throw new IllegalStateException(); } @@ -238,6 +297,15 @@ import org.slf4j.LoggerFactory; return false; } + boolean this_present_isStatsCompliant = true && this.isSetIsStatsCompliant(); + boolean that_present_isStatsCompliant = true && that.isSetIsStatsCompliant(); + if (this_present_isStatsCompliant || that_present_isStatsCompliant) { + if (!(this_present_isStatsCompliant && that_present_isStatsCompliant)) + return false; + if (!this.isStatsCompliant.equals(that.isStatsCompliant)) + return false; + } + return true; } @@ -250,6 +318,11 @@ import org.slf4j.LoggerFactory; if (present_partitions) list.add(partitions); + boolean present_isStatsCompliant = true && (isSetIsStatsCompliant()); + list.add(present_isStatsCompliant); + if (present_isStatsCompliant) + list.add(isStatsCompliant.getValue()); + return list.hashCode(); } @@ -271,6 +344,16 @@ import org.slf4j.LoggerFactory; return lastComparison; } } + lastComparison = Boolean.valueOf(isSetIsStatsCompliant()).compareTo(other.isSetIsStatsCompliant()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetIsStatsCompliant()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isStatsCompliant, other.isStatsCompliant); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -300,6 +383,16 @@ import org.slf4j.LoggerFactory; } first = false; } + if (isSetIsStatsCompliant()) { + if (!first) sb.append(", "); + sb.append("isStatsCompliant:"); + if (this.isStatsCompliant == null) { + sb.append("null"); + } else { + sb.append(this.isStatsCompliant); + } + first = false; + } sb.append(")"); return sb.toString(); } @@ -362,6 +455,14 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 2: // IS_STATS_COMPLIANT + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + struct.isStatsCompliant = org.apache.hadoop.hive.metastore.api.IsolationLevelCompliance.findByValue(iprot.readI32()); + struct.setIsStatsCompliantIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -389,6 +490,13 @@ import org.slf4j.LoggerFactory; oprot.writeFieldEnd(); } } + if (struct.isStatsCompliant != null) { + if (struct.isSetIsStatsCompliant()) { + oprot.writeFieldBegin(IS_STATS_COMPLIANT_FIELD_DESC); + oprot.writeI32(struct.isStatsCompliant.getValue()); + oprot.writeFieldEnd(); + } + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -410,7 +518,10 @@ import org.slf4j.LoggerFactory; if (struct.isSetPartitions()) { optionals.set(0); } - oprot.writeBitSet(optionals, 1); + if (struct.isSetIsStatsCompliant()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); if (struct.isSetPartitions()) { { oprot.writeI32(struct.partitions.size()); @@ -420,12 +531,15 @@ import org.slf4j.LoggerFactory; } } } + if (struct.isSetIsStatsCompliant()) { + oprot.writeI32(struct.isStatsCompliant.getValue()); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, AddPartitionsResult struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { org.apache.thrift.protocol.TList _list479 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); @@ -440,6 +554,10 @@ import org.slf4j.LoggerFactory; } struct.setPartitionsIsSet(true); } + if (incoming.get(1)) { + struct.isStatsCompliant = org.apache.hadoop.hive.metastore.api.IsolationLevelCompliance.findByValue(iprot.readI32()); + struct.setIsStatsCompliantIsSet(true); + } } } http://git-wip-us.apache.org/repos/asf/hive/blob/1d46608e/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AggrStats.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AggrStats.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AggrStats.java index fff212d..fea95c3 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AggrStats.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AggrStats.java @@ -40,6 +40,7 @@ import org.slf4j.LoggerFactory; private static final org.apache.thrift.protocol.TField COL_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("colStats", org.apache.thrift.protocol.TType.LIST, (short)1); private static final org.apache.thrift.protocol.TField PARTS_FOUND_FIELD_DESC = new org.apache.thrift.protocol.TField("partsFound", org.apache.thrift.protocol.TType.I64, (short)2); + private static final org.apache.thrift.protocol.TField IS_STATS_COMPLIANT_FIELD_DESC = new org.apache.thrift.protocol.TField("isStatsCompliant", org.apache.thrift.protocol.TType.I32, (short)3); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -49,11 +50,17 @@ import org.slf4j.LoggerFactory; private List<ColumnStatisticsObj> colStats; // required private long partsFound; // required + private IsolationLevelCompliance isStatsCompliant; // 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 { COL_STATS((short)1, "colStats"), - PARTS_FOUND((short)2, "partsFound"); + PARTS_FOUND((short)2, "partsFound"), + /** + * + * @see IsolationLevelCompliance + */ + IS_STATS_COMPLIANT((short)3, "isStatsCompliant"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -72,6 +79,8 @@ import org.slf4j.LoggerFactory; return COL_STATS; case 2: // PARTS_FOUND return PARTS_FOUND; + case 3: // IS_STATS_COMPLIANT + return IS_STATS_COMPLIANT; default: return null; } @@ -114,6 +123,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __PARTSFOUND_ISSET_ID = 0; private byte __isset_bitfield = 0; + private static final _Fields optionals[] = {_Fields.IS_STATS_COMPLIANT}; 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); @@ -122,6 +132,8 @@ import org.slf4j.LoggerFactory; new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ColumnStatisticsObj.class)))); tmpMap.put(_Fields.PARTS_FOUND, new org.apache.thrift.meta_data.FieldMetaData("partsFound", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); + tmpMap.put(_Fields.IS_STATS_COMPLIANT, new org.apache.thrift.meta_data.FieldMetaData("isStatsCompliant", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, IsolationLevelCompliance.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AggrStats.class, metaDataMap); } @@ -152,6 +164,9 @@ import org.slf4j.LoggerFactory; this.colStats = __this__colStats; } this.partsFound = other.partsFound; + if (other.isSetIsStatsCompliant()) { + this.isStatsCompliant = other.isStatsCompliant; + } } public AggrStats deepCopy() { @@ -163,6 +178,7 @@ import org.slf4j.LoggerFactory; this.colStats = null; setPartsFoundIsSet(false); this.partsFound = 0; + this.isStatsCompliant = null; } public int getColStatsSize() { @@ -225,6 +241,37 @@ import org.slf4j.LoggerFactory; __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PARTSFOUND_ISSET_ID, value); } + /** + * + * @see IsolationLevelCompliance + */ + public IsolationLevelCompliance getIsStatsCompliant() { + return this.isStatsCompliant; + } + + /** + * + * @see IsolationLevelCompliance + */ + public void setIsStatsCompliant(IsolationLevelCompliance isStatsCompliant) { + this.isStatsCompliant = isStatsCompliant; + } + + public void unsetIsStatsCompliant() { + this.isStatsCompliant = null; + } + + /** Returns true if field isStatsCompliant is set (has been assigned a value) and false otherwise */ + public boolean isSetIsStatsCompliant() { + return this.isStatsCompliant != null; + } + + public void setIsStatsCompliantIsSet(boolean value) { + if (!value) { + this.isStatsCompliant = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case COL_STATS: @@ -243,6 +290,14 @@ import org.slf4j.LoggerFactory; } break; + case IS_STATS_COMPLIANT: + if (value == null) { + unsetIsStatsCompliant(); + } else { + setIsStatsCompliant((IsolationLevelCompliance)value); + } + break; + } } @@ -254,6 +309,9 @@ import org.slf4j.LoggerFactory; case PARTS_FOUND: return getPartsFound(); + case IS_STATS_COMPLIANT: + return getIsStatsCompliant(); + } throw new IllegalStateException(); } @@ -269,6 +327,8 @@ import org.slf4j.LoggerFactory; return isSetColStats(); case PARTS_FOUND: return isSetPartsFound(); + case IS_STATS_COMPLIANT: + return isSetIsStatsCompliant(); } throw new IllegalStateException(); } @@ -304,6 +364,15 @@ import org.slf4j.LoggerFactory; return false; } + boolean this_present_isStatsCompliant = true && this.isSetIsStatsCompliant(); + boolean that_present_isStatsCompliant = true && that.isSetIsStatsCompliant(); + if (this_present_isStatsCompliant || that_present_isStatsCompliant) { + if (!(this_present_isStatsCompliant && that_present_isStatsCompliant)) + return false; + if (!this.isStatsCompliant.equals(that.isStatsCompliant)) + return false; + } + return true; } @@ -321,6 +390,11 @@ import org.slf4j.LoggerFactory; if (present_partsFound) list.add(partsFound); + boolean present_isStatsCompliant = true && (isSetIsStatsCompliant()); + list.add(present_isStatsCompliant); + if (present_isStatsCompliant) + list.add(isStatsCompliant.getValue()); + return list.hashCode(); } @@ -352,6 +426,16 @@ import org.slf4j.LoggerFactory; return lastComparison; } } + lastComparison = Boolean.valueOf(isSetIsStatsCompliant()).compareTo(other.isSetIsStatsCompliant()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetIsStatsCompliant()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isStatsCompliant, other.isStatsCompliant); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -383,6 +467,16 @@ import org.slf4j.LoggerFactory; sb.append("partsFound:"); sb.append(this.partsFound); first = false; + if (isSetIsStatsCompliant()) { + if (!first) sb.append(", "); + sb.append("isStatsCompliant:"); + if (this.isStatsCompliant == null) { + sb.append("null"); + } else { + sb.append(this.isStatsCompliant); + } + first = false; + } sb.append(")"); return sb.toString(); } @@ -463,6 +557,14 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 3: // IS_STATS_COMPLIANT + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + struct.isStatsCompliant = org.apache.hadoop.hive.metastore.api.IsolationLevelCompliance.findByValue(iprot.readI32()); + struct.setIsStatsCompliantIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -491,6 +593,13 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(PARTS_FOUND_FIELD_DESC); oprot.writeI64(struct.partsFound); oprot.writeFieldEnd(); + if (struct.isStatsCompliant != null) { + if (struct.isSetIsStatsCompliant()) { + oprot.writeFieldBegin(IS_STATS_COMPLIANT_FIELD_DESC); + oprot.writeI32(struct.isStatsCompliant.getValue()); + oprot.writeFieldEnd(); + } + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -516,6 +625,14 @@ import org.slf4j.LoggerFactory; } } oprot.writeI64(struct.partsFound); + BitSet optionals = new BitSet(); + if (struct.isSetIsStatsCompliant()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.isSetIsStatsCompliant()) { + oprot.writeI32(struct.isStatsCompliant.getValue()); + } } @Override @@ -535,6 +652,11 @@ import org.slf4j.LoggerFactory; struct.setColStatsIsSet(true); struct.partsFound = iprot.readI64(); struct.setPartsFoundIsSet(true); + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.isStatsCompliant = org.apache.hadoop.hive.metastore.api.IsolationLevelCompliance.findByValue(iprot.readI32()); + struct.setIsStatsCompliantIsSet(true); + } } }