From dbde32968b39fb09659b49315f7946256671a0f0 Mon Sep 17 00:00:00 2001 From: Denys Kuzmenko Date: Thu, 23 Oct 2025 20:00:26 +0300 Subject: [PATCH] Revert "HIVE-23931: Send ValidWriteIdList and tableId to get_*_constraints HMS APIs (Ashish Sharma, reviewed by Kishan Das, Zoltan Haindrich)" This reverts commit 8af656c75d7df567c6bdc6243b7766bd047053d5. --- .../table/info/desc/DescTableOperation.java | 5 +- .../hive/ql/exec/repl/ReplDumpTask.java | 6 +- .../apache/hadoop/hive/ql/metadata/Hive.java | 21 +- .../apache/hadoop/hive/ql/metadata/Table.java | 3 +- .../hive/ql/exec/repl/TestReplDumpTask.java | 2 +- .../thrift/gen-cpp/hive_metastore_types.cpp | 323 ------------------ .../gen/thrift/gen-cpp/hive_metastore_types.h | 169 +-------- .../api/AllTableConstraintsRequest.java | 216 +----------- .../api/CheckConstraintsRequest.java | 216 +----------- .../api/DefaultConstraintsRequest.java | 216 +----------- .../metastore/api/ForeignKeysRequest.java | 218 +----------- .../api/NotNullConstraintsRequest.java | 216 +----------- .../metastore/api/PrimaryKeysRequest.java | 218 +----------- .../api/UniqueConstraintsRequest.java | 216 +----------- .../metastore/AllTableConstraintsRequest.php | 48 --- .../metastore/CheckConstraintsRequest.php | 48 --- .../metastore/DefaultConstraintsRequest.php | 48 --- .../gen-php/metastore/ForeignKeysRequest.php | 48 --- .../metastore/NotNullConstraintsRequest.php | 48 --- .../gen-php/metastore/PrimaryKeysRequest.php | 48 --- .../metastore/UniqueConstraintsRequest.php | 48 --- .../thrift/gen-py/hive_metastore/ttypes.py | 182 +--------- .../gen/thrift/gen-rb/hive_metastore_types.rb | 42 +-- .../src/main/thrift/hive_metastore.thrift | 26 +- .../hive/metastore/cache/CachedStore.java | 6 +- 25 files changed, 59 insertions(+), 2578 deletions(-) diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/desc/DescTableOperation.java b/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/desc/DescTableOperation.java index 3fa15fdc651e..a7cd18253751 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/desc/DescTableOperation.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/desc/DescTableOperation.java @@ -291,9 +291,8 @@ private static void fixDecimalColumnTypeName(List cols) { private void setConstraintsAndStorageHandlerInfo(Table table) throws HiveException { if (desc.isExtended() || desc.isFormatted()) { - TableConstraintsInfo tableConstraintsInfo = context.getDb() - .getTableConstraints(table.getDbName(), table.getTableName(), false, false, - table.getTTable() != null ? table.getTTable().getId() : -1); + TableConstraintsInfo tableConstraintsInfo = context.getDb().getTableConstraints( + table.getDbName(), table.getTableName(), false, false); table.setTableConstraintsInfo(tableConstraintsInfo); table.setStorageHandlerInfo(context.getDb().getStorageHandlerInfo(table)); } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/repl/ReplDumpTask.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/repl/ReplDumpTask.java index 2e3d4922dfde..2390984cce48 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/repl/ReplDumpTask.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/repl/ReplDumpTask.java @@ -1449,7 +1449,7 @@ Long bootStrapDump(Path dumpRoot, DumpMetaData dmd, Path cmRoot, Hive hiveDb) // Just log a debug message and skip it. LOG.debug(te.getMessage()); } - dumpConstraintMetadata(dbName, tblName, dbRoot, hiveDb, table != null ? table.getTTable().getId() : -1); + dumpConstraintMetadata(dbName, tblName, dbRoot, hiveDb); if (tableList != null && doesTableSatisfyConfig(table)) { tableList.add(tblName); } @@ -1789,12 +1789,12 @@ List dumpFunctionMetadata(String dbName, Path dbMetadataR return functionsBinaryCopyPaths; } - void dumpConstraintMetadata(String dbName, String tblName, Path dbRoot, Hive hiveDb, long tableId) throws Exception { + void dumpConstraintMetadata(String dbName, String tblName, Path dbRoot, Hive hiveDb) throws Exception { try { Path constraintsRoot = new Path(dbRoot, ReplUtils.CONSTRAINTS_ROOT_DIR_NAME); Path commonConstraintsFile = new Path(constraintsRoot, ConstraintFileType.COMMON.getPrefix() + tblName); Path fkConstraintsFile = new Path(constraintsRoot, ConstraintFileType.FOREIGNKEY.getPrefix() + tblName); - SQLAllTableConstraints tableConstraints = hiveDb.getTableConstraints(dbName, tblName, tableId); + SQLAllTableConstraints tableConstraints = hiveDb.getTableConstraints(dbName, tblName); if (CollectionUtils.isNotEmpty(tableConstraints.getPrimaryKeys()) || CollectionUtils.isNotEmpty(tableConstraints.getUniqueConstraints()) || CollectionUtils.isNotEmpty(tableConstraints.getNotNullConstraints()) diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java index 07b98266d85c..e107fbfacbc7 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java @@ -6637,14 +6637,11 @@ public List getCheckConstraintList(String dbName, String tbl } } - public SQLAllTableConstraints getTableConstraints(String dbName, String tblName, long tableId) + public SQLAllTableConstraints getTableConstraints(String dbName, String tblName) throws HiveException, NoSuchObjectException { try { - ValidWriteIdList validWriteIdList = getValidWriteIdList(dbName, tblName); - AllTableConstraintsRequest request = new AllTableConstraintsRequest(dbName, tblName, getDefaultCatalog(conf)); - request.setTableId(tableId); - request.setValidWriteIdList(validWriteIdList != null ? validWriteIdList.writeToString() : null); - return getMSC().getAllTableConstraints(request); + return getMSC().getAllTableConstraints( + new AllTableConstraintsRequest(dbName, tblName, getDefaultCatalog(conf))); } catch (NoSuchObjectException e) { throw e; } catch (Exception e) { @@ -6653,18 +6650,12 @@ public SQLAllTableConstraints getTableConstraints(String dbName, String tblName, } public TableConstraintsInfo getTableConstraints(String dbName, String tblName, boolean fetchReliable, - boolean fetchEnabled, long tableId) throws HiveException { + boolean fetchEnabled) throws HiveException { PerfLogger perfLogger = SessionState.getPerfLogger(); perfLogger.perfLogBegin(CLASS_NAME, PerfLogger.HIVE_GET_TABLE_CONSTRAINTS); - try { - - ValidWriteIdList validWriteIdList = getValidWriteIdList(dbName,tblName); - AllTableConstraintsRequest request = new AllTableConstraintsRequest(dbName, tblName, getDefaultCatalog(conf)); - request.setValidWriteIdList(validWriteIdList != null ? validWriteIdList.writeToString() : null); - request.setTableId(tableId); - - SQLAllTableConstraints tableConstraints = getMSC().getAllTableConstraints(request); + SQLAllTableConstraints tableConstraints = getMSC().getAllTableConstraints( + new AllTableConstraintsRequest(dbName, tblName, getDefaultCatalog(conf))); if (fetchReliable && tableConstraints != null) { if (CollectionUtils.isNotEmpty(tableConstraints.getPrimaryKeys())) { tableConstraints.setPrimaryKeys( diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java index 8a37073509ef..c30ed3546b39 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java @@ -1235,8 +1235,7 @@ public TableConstraintsInfo getTableConstraintsInfo() { if (!isTableConstraintsFetched) { try { - tableConstraintsInfo = Hive.get().getTableConstraints(this.getDbName(), this.getTableName(), true, true, - this.getTTable() != null ? this.getTTable().getId() : -1); + tableConstraintsInfo = Hive.get().getTableConstraints(this.getDbName(), this.getTableName(), true, true); this.isTableConstraintsFetched = true; } catch (HiveException e) { LOG.warn("Cannot retrieve Table Constraints info for table : " + this.getTableName() + " ignoring exception: " + e); diff --git a/ql/src/test/org/apache/hadoop/hive/ql/exec/repl/TestReplDumpTask.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/repl/TestReplDumpTask.java index 847de7c50803..7b76f2030ee8 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/exec/repl/TestReplDumpTask.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/repl/TestReplDumpTask.java @@ -96,7 +96,7 @@ Path dumpDbMetadata(String dbName, Path metadataRoot, long lastReplId, Hive hive } @Override - void dumpConstraintMetadata(String dbName, String tblName, Path dbRoot, Hive hiveDb, long tableId) { + void dumpConstraintMetadata(String dbName, String tblName, Path dbRoot, Hive hiveDb) { } } diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_types.cpp b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_types.cpp index 1af7e85c898b..d1829dc8214b 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_types.cpp +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_types.cpp @@ -14673,16 +14673,6 @@ void PrimaryKeysRequest::__set_catName(const std::string& val) { this->catName = val; __isset.catName = true; } - -void PrimaryKeysRequest::__set_validWriteIdList(const std::string& val) { - this->validWriteIdList = val; -__isset.validWriteIdList = true; -} - -void PrimaryKeysRequest::__set_tableId(const int64_t val) { - this->tableId = val; -__isset.tableId = true; -} std::ostream& operator<<(std::ostream& out, const PrimaryKeysRequest& obj) { obj.printTo(out); @@ -14737,22 +14727,6 @@ uint32_t PrimaryKeysRequest::read(::apache::thrift::protocol::TProtocol* iprot) xfer += iprot->skip(ftype); } break; - case 4: - if (ftype == ::apache::thrift::protocol::T_STRING) { - xfer += iprot->readString(this->validWriteIdList); - this->__isset.validWriteIdList = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 5: - if (ftype == ::apache::thrift::protocol::T_I64) { - xfer += iprot->readI64(this->tableId); - this->__isset.tableId = true; - } else { - xfer += iprot->skip(ftype); - } - break; default: xfer += iprot->skip(ftype); break; @@ -14787,16 +14761,6 @@ uint32_t PrimaryKeysRequest::write(::apache::thrift::protocol::TProtocol* oprot) xfer += oprot->writeString(this->catName); xfer += oprot->writeFieldEnd(); } - if (this->__isset.validWriteIdList) { - xfer += oprot->writeFieldBegin("validWriteIdList", ::apache::thrift::protocol::T_STRING, 4); - xfer += oprot->writeString(this->validWriteIdList); - xfer += oprot->writeFieldEnd(); - } - if (this->__isset.tableId) { - xfer += oprot->writeFieldBegin("tableId", ::apache::thrift::protocol::T_I64, 5); - xfer += oprot->writeI64(this->tableId); - xfer += oprot->writeFieldEnd(); - } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); return xfer; @@ -14807,8 +14771,6 @@ void swap(PrimaryKeysRequest &a, PrimaryKeysRequest &b) { swap(a.db_name, b.db_name); swap(a.tbl_name, b.tbl_name); swap(a.catName, b.catName); - swap(a.validWriteIdList, b.validWriteIdList); - swap(a.tableId, b.tableId); swap(a.__isset, b.__isset); } @@ -14816,16 +14778,12 @@ PrimaryKeysRequest::PrimaryKeysRequest(const PrimaryKeysRequest& other539) { db_name = other539.db_name; tbl_name = other539.tbl_name; catName = other539.catName; - validWriteIdList = other539.validWriteIdList; - tableId = other539.tableId; __isset = other539.__isset; } PrimaryKeysRequest& PrimaryKeysRequest::operator=(const PrimaryKeysRequest& other540) { db_name = other540.db_name; tbl_name = other540.tbl_name; catName = other540.catName; - validWriteIdList = other540.validWriteIdList; - tableId = other540.tableId; __isset = other540.__isset; return *this; } @@ -14835,8 +14793,6 @@ void PrimaryKeysRequest::printTo(std::ostream& out) const { out << "db_name=" << to_string(db_name); out << ", " << "tbl_name=" << to_string(tbl_name); out << ", " << "catName="; (__isset.catName ? (out << to_string(catName)) : (out << "")); - out << ", " << "validWriteIdList="; (__isset.validWriteIdList ? (out << to_string(validWriteIdList)) : (out << "")); - out << ", " << "tableId="; (__isset.tableId ? (out << to_string(tableId)) : (out << "")); out << ")"; } @@ -14977,16 +14933,6 @@ void ForeignKeysRequest::__set_catName(const std::string& val) { this->catName = val; __isset.catName = true; } - -void ForeignKeysRequest::__set_validWriteIdList(const std::string& val) { - this->validWriteIdList = val; -__isset.validWriteIdList = true; -} - -void ForeignKeysRequest::__set_tableId(const int64_t val) { - this->tableId = val; -__isset.tableId = true; -} std::ostream& operator<<(std::ostream& out, const ForeignKeysRequest& obj) { obj.printTo(out); @@ -15055,22 +15001,6 @@ uint32_t ForeignKeysRequest::read(::apache::thrift::protocol::TProtocol* iprot) xfer += iprot->skip(ftype); } break; - case 6: - if (ftype == ::apache::thrift::protocol::T_STRING) { - xfer += iprot->readString(this->validWriteIdList); - this->__isset.validWriteIdList = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 7: - if (ftype == ::apache::thrift::protocol::T_I64) { - xfer += iprot->readI64(this->tableId); - this->__isset.tableId = true; - } else { - xfer += iprot->skip(ftype); - } - break; default: xfer += iprot->skip(ftype); break; @@ -15109,16 +15039,6 @@ uint32_t ForeignKeysRequest::write(::apache::thrift::protocol::TProtocol* oprot) xfer += oprot->writeString(this->catName); xfer += oprot->writeFieldEnd(); } - if (this->__isset.validWriteIdList) { - xfer += oprot->writeFieldBegin("validWriteIdList", ::apache::thrift::protocol::T_STRING, 6); - xfer += oprot->writeString(this->validWriteIdList); - xfer += oprot->writeFieldEnd(); - } - if (this->__isset.tableId) { - xfer += oprot->writeFieldBegin("tableId", ::apache::thrift::protocol::T_I64, 7); - xfer += oprot->writeI64(this->tableId); - xfer += oprot->writeFieldEnd(); - } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); return xfer; @@ -15131,8 +15051,6 @@ void swap(ForeignKeysRequest &a, ForeignKeysRequest &b) { swap(a.foreign_db_name, b.foreign_db_name); swap(a.foreign_tbl_name, b.foreign_tbl_name); swap(a.catName, b.catName); - swap(a.validWriteIdList, b.validWriteIdList); - swap(a.tableId, b.tableId); swap(a.__isset, b.__isset); } @@ -15142,8 +15060,6 @@ ForeignKeysRequest::ForeignKeysRequest(const ForeignKeysRequest& other549) { foreign_db_name = other549.foreign_db_name; foreign_tbl_name = other549.foreign_tbl_name; catName = other549.catName; - validWriteIdList = other549.validWriteIdList; - tableId = other549.tableId; __isset = other549.__isset; } ForeignKeysRequest& ForeignKeysRequest::operator=(const ForeignKeysRequest& other550) { @@ -15152,8 +15068,6 @@ ForeignKeysRequest& ForeignKeysRequest::operator=(const ForeignKeysRequest& othe foreign_db_name = other550.foreign_db_name; foreign_tbl_name = other550.foreign_tbl_name; catName = other550.catName; - validWriteIdList = other550.validWriteIdList; - tableId = other550.tableId; __isset = other550.__isset; return *this; } @@ -15165,8 +15079,6 @@ void ForeignKeysRequest::printTo(std::ostream& out) const { out << ", " << "foreign_db_name=" << to_string(foreign_db_name); out << ", " << "foreign_tbl_name=" << to_string(foreign_tbl_name); out << ", " << "catName="; (__isset.catName ? (out << to_string(catName)) : (out << "")); - out << ", " << "validWriteIdList="; (__isset.validWriteIdList ? (out << to_string(validWriteIdList)) : (out << "")); - out << ", " << "tableId="; (__isset.tableId ? (out << to_string(tableId)) : (out << "")); out << ")"; } @@ -15298,16 +15210,6 @@ void UniqueConstraintsRequest::__set_db_name(const std::string& val) { void UniqueConstraintsRequest::__set_tbl_name(const std::string& val) { this->tbl_name = val; } - -void UniqueConstraintsRequest::__set_validWriteIdList(const std::string& val) { - this->validWriteIdList = val; -__isset.validWriteIdList = true; -} - -void UniqueConstraintsRequest::__set_tableId(const int64_t val) { - this->tableId = val; -__isset.tableId = true; -} std::ostream& operator<<(std::ostream& out, const UniqueConstraintsRequest& obj) { obj.printTo(out); @@ -15363,22 +15265,6 @@ uint32_t UniqueConstraintsRequest::read(::apache::thrift::protocol::TProtocol* i xfer += iprot->skip(ftype); } break; - case 4: - if (ftype == ::apache::thrift::protocol::T_STRING) { - xfer += iprot->readString(this->validWriteIdList); - this->__isset.validWriteIdList = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 5: - if (ftype == ::apache::thrift::protocol::T_I64) { - xfer += iprot->readI64(this->tableId); - this->__isset.tableId = true; - } else { - xfer += iprot->skip(ftype); - } - break; default: xfer += iprot->skip(ftype); break; @@ -15414,16 +15300,6 @@ uint32_t UniqueConstraintsRequest::write(::apache::thrift::protocol::TProtocol* xfer += oprot->writeString(this->tbl_name); xfer += oprot->writeFieldEnd(); - if (this->__isset.validWriteIdList) { - xfer += oprot->writeFieldBegin("validWriteIdList", ::apache::thrift::protocol::T_STRING, 4); - xfer += oprot->writeString(this->validWriteIdList); - xfer += oprot->writeFieldEnd(); - } - if (this->__isset.tableId) { - xfer += oprot->writeFieldBegin("tableId", ::apache::thrift::protocol::T_I64, 5); - xfer += oprot->writeI64(this->tableId); - xfer += oprot->writeFieldEnd(); - } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); return xfer; @@ -15434,26 +15310,17 @@ void swap(UniqueConstraintsRequest &a, UniqueConstraintsRequest &b) { swap(a.catName, b.catName); swap(a.db_name, b.db_name); swap(a.tbl_name, b.tbl_name); - swap(a.validWriteIdList, b.validWriteIdList); - swap(a.tableId, b.tableId); - swap(a.__isset, b.__isset); } UniqueConstraintsRequest::UniqueConstraintsRequest(const UniqueConstraintsRequest& other559) { catName = other559.catName; db_name = other559.db_name; tbl_name = other559.tbl_name; - validWriteIdList = other559.validWriteIdList; - tableId = other559.tableId; - __isset = other559.__isset; } UniqueConstraintsRequest& UniqueConstraintsRequest::operator=(const UniqueConstraintsRequest& other560) { catName = other560.catName; db_name = other560.db_name; tbl_name = other560.tbl_name; - validWriteIdList = other560.validWriteIdList; - tableId = other560.tableId; - __isset = other560.__isset; return *this; } void UniqueConstraintsRequest::printTo(std::ostream& out) const { @@ -15462,8 +15329,6 @@ void UniqueConstraintsRequest::printTo(std::ostream& out) const { out << "catName=" << to_string(catName); out << ", " << "db_name=" << to_string(db_name); out << ", " << "tbl_name=" << to_string(tbl_name); - out << ", " << "validWriteIdList="; (__isset.validWriteIdList ? (out << to_string(validWriteIdList)) : (out << "")); - out << ", " << "tableId="; (__isset.tableId ? (out << to_string(tableId)) : (out << "")); out << ")"; } @@ -15595,16 +15460,6 @@ void NotNullConstraintsRequest::__set_db_name(const std::string& val) { void NotNullConstraintsRequest::__set_tbl_name(const std::string& val) { this->tbl_name = val; } - -void NotNullConstraintsRequest::__set_validWriteIdList(const std::string& val) { - this->validWriteIdList = val; -__isset.validWriteIdList = true; -} - -void NotNullConstraintsRequest::__set_tableId(const int64_t val) { - this->tableId = val; -__isset.tableId = true; -} std::ostream& operator<<(std::ostream& out, const NotNullConstraintsRequest& obj) { obj.printTo(out); @@ -15660,22 +15515,6 @@ uint32_t NotNullConstraintsRequest::read(::apache::thrift::protocol::TProtocol* xfer += iprot->skip(ftype); } break; - case 4: - if (ftype == ::apache::thrift::protocol::T_STRING) { - xfer += iprot->readString(this->validWriteIdList); - this->__isset.validWriteIdList = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 5: - if (ftype == ::apache::thrift::protocol::T_I64) { - xfer += iprot->readI64(this->tableId); - this->__isset.tableId = true; - } else { - xfer += iprot->skip(ftype); - } - break; default: xfer += iprot->skip(ftype); break; @@ -15711,16 +15550,6 @@ uint32_t NotNullConstraintsRequest::write(::apache::thrift::protocol::TProtocol* xfer += oprot->writeString(this->tbl_name); xfer += oprot->writeFieldEnd(); - if (this->__isset.validWriteIdList) { - xfer += oprot->writeFieldBegin("validWriteIdList", ::apache::thrift::protocol::T_STRING, 4); - xfer += oprot->writeString(this->validWriteIdList); - xfer += oprot->writeFieldEnd(); - } - if (this->__isset.tableId) { - xfer += oprot->writeFieldBegin("tableId", ::apache::thrift::protocol::T_I64, 5); - xfer += oprot->writeI64(this->tableId); - xfer += oprot->writeFieldEnd(); - } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); return xfer; @@ -15731,26 +15560,17 @@ void swap(NotNullConstraintsRequest &a, NotNullConstraintsRequest &b) { swap(a.catName, b.catName); swap(a.db_name, b.db_name); swap(a.tbl_name, b.tbl_name); - swap(a.validWriteIdList, b.validWriteIdList); - swap(a.tableId, b.tableId); - swap(a.__isset, b.__isset); } NotNullConstraintsRequest::NotNullConstraintsRequest(const NotNullConstraintsRequest& other569) { catName = other569.catName; db_name = other569.db_name; tbl_name = other569.tbl_name; - validWriteIdList = other569.validWriteIdList; - tableId = other569.tableId; - __isset = other569.__isset; } NotNullConstraintsRequest& NotNullConstraintsRequest::operator=(const NotNullConstraintsRequest& other570) { catName = other570.catName; db_name = other570.db_name; tbl_name = other570.tbl_name; - validWriteIdList = other570.validWriteIdList; - tableId = other570.tableId; - __isset = other570.__isset; return *this; } void NotNullConstraintsRequest::printTo(std::ostream& out) const { @@ -15759,8 +15579,6 @@ void NotNullConstraintsRequest::printTo(std::ostream& out) const { out << "catName=" << to_string(catName); out << ", " << "db_name=" << to_string(db_name); out << ", " << "tbl_name=" << to_string(tbl_name); - out << ", " << "validWriteIdList="; (__isset.validWriteIdList ? (out << to_string(validWriteIdList)) : (out << "")); - out << ", " << "tableId="; (__isset.tableId ? (out << to_string(tableId)) : (out << "")); out << ")"; } @@ -15892,16 +15710,6 @@ void DefaultConstraintsRequest::__set_db_name(const std::string& val) { void DefaultConstraintsRequest::__set_tbl_name(const std::string& val) { this->tbl_name = val; } - -void DefaultConstraintsRequest::__set_validWriteIdList(const std::string& val) { - this->validWriteIdList = val; -__isset.validWriteIdList = true; -} - -void DefaultConstraintsRequest::__set_tableId(const int64_t val) { - this->tableId = val; -__isset.tableId = true; -} std::ostream& operator<<(std::ostream& out, const DefaultConstraintsRequest& obj) { obj.printTo(out); @@ -15957,22 +15765,6 @@ uint32_t DefaultConstraintsRequest::read(::apache::thrift::protocol::TProtocol* xfer += iprot->skip(ftype); } break; - case 4: - if (ftype == ::apache::thrift::protocol::T_STRING) { - xfer += iprot->readString(this->validWriteIdList); - this->__isset.validWriteIdList = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 5: - if (ftype == ::apache::thrift::protocol::T_I64) { - xfer += iprot->readI64(this->tableId); - this->__isset.tableId = true; - } else { - xfer += iprot->skip(ftype); - } - break; default: xfer += iprot->skip(ftype); break; @@ -16008,16 +15800,6 @@ uint32_t DefaultConstraintsRequest::write(::apache::thrift::protocol::TProtocol* xfer += oprot->writeString(this->tbl_name); xfer += oprot->writeFieldEnd(); - if (this->__isset.validWriteIdList) { - xfer += oprot->writeFieldBegin("validWriteIdList", ::apache::thrift::protocol::T_STRING, 4); - xfer += oprot->writeString(this->validWriteIdList); - xfer += oprot->writeFieldEnd(); - } - if (this->__isset.tableId) { - xfer += oprot->writeFieldBegin("tableId", ::apache::thrift::protocol::T_I64, 5); - xfer += oprot->writeI64(this->tableId); - xfer += oprot->writeFieldEnd(); - } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); return xfer; @@ -16028,26 +15810,17 @@ void swap(DefaultConstraintsRequest &a, DefaultConstraintsRequest &b) { swap(a.catName, b.catName); swap(a.db_name, b.db_name); swap(a.tbl_name, b.tbl_name); - swap(a.validWriteIdList, b.validWriteIdList); - swap(a.tableId, b.tableId); - swap(a.__isset, b.__isset); } DefaultConstraintsRequest::DefaultConstraintsRequest(const DefaultConstraintsRequest& other579) { catName = other579.catName; db_name = other579.db_name; tbl_name = other579.tbl_name; - validWriteIdList = other579.validWriteIdList; - tableId = other579.tableId; - __isset = other579.__isset; } DefaultConstraintsRequest& DefaultConstraintsRequest::operator=(const DefaultConstraintsRequest& other580) { catName = other580.catName; db_name = other580.db_name; tbl_name = other580.tbl_name; - validWriteIdList = other580.validWriteIdList; - tableId = other580.tableId; - __isset = other580.__isset; return *this; } void DefaultConstraintsRequest::printTo(std::ostream& out) const { @@ -16056,8 +15829,6 @@ void DefaultConstraintsRequest::printTo(std::ostream& out) const { out << "catName=" << to_string(catName); out << ", " << "db_name=" << to_string(db_name); out << ", " << "tbl_name=" << to_string(tbl_name); - out << ", " << "validWriteIdList="; (__isset.validWriteIdList ? (out << to_string(validWriteIdList)) : (out << "")); - out << ", " << "tableId="; (__isset.tableId ? (out << to_string(tableId)) : (out << "")); out << ")"; } @@ -16189,16 +15960,6 @@ void CheckConstraintsRequest::__set_db_name(const std::string& val) { void CheckConstraintsRequest::__set_tbl_name(const std::string& val) { this->tbl_name = val; } - -void CheckConstraintsRequest::__set_validWriteIdList(const std::string& val) { - this->validWriteIdList = val; -__isset.validWriteIdList = true; -} - -void CheckConstraintsRequest::__set_tableId(const int64_t val) { - this->tableId = val; -__isset.tableId = true; -} std::ostream& operator<<(std::ostream& out, const CheckConstraintsRequest& obj) { obj.printTo(out); @@ -16254,22 +16015,6 @@ uint32_t CheckConstraintsRequest::read(::apache::thrift::protocol::TProtocol* ip xfer += iprot->skip(ftype); } break; - case 4: - if (ftype == ::apache::thrift::protocol::T_STRING) { - xfer += iprot->readString(this->validWriteIdList); - this->__isset.validWriteIdList = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 5: - if (ftype == ::apache::thrift::protocol::T_I64) { - xfer += iprot->readI64(this->tableId); - this->__isset.tableId = true; - } else { - xfer += iprot->skip(ftype); - } - break; default: xfer += iprot->skip(ftype); break; @@ -16305,16 +16050,6 @@ uint32_t CheckConstraintsRequest::write(::apache::thrift::protocol::TProtocol* o xfer += oprot->writeString(this->tbl_name); xfer += oprot->writeFieldEnd(); - if (this->__isset.validWriteIdList) { - xfer += oprot->writeFieldBegin("validWriteIdList", ::apache::thrift::protocol::T_STRING, 4); - xfer += oprot->writeString(this->validWriteIdList); - xfer += oprot->writeFieldEnd(); - } - if (this->__isset.tableId) { - xfer += oprot->writeFieldBegin("tableId", ::apache::thrift::protocol::T_I64, 5); - xfer += oprot->writeI64(this->tableId); - xfer += oprot->writeFieldEnd(); - } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); return xfer; @@ -16325,26 +16060,17 @@ void swap(CheckConstraintsRequest &a, CheckConstraintsRequest &b) { swap(a.catName, b.catName); swap(a.db_name, b.db_name); swap(a.tbl_name, b.tbl_name); - swap(a.validWriteIdList, b.validWriteIdList); - swap(a.tableId, b.tableId); - swap(a.__isset, b.__isset); } CheckConstraintsRequest::CheckConstraintsRequest(const CheckConstraintsRequest& other589) { catName = other589.catName; db_name = other589.db_name; tbl_name = other589.tbl_name; - validWriteIdList = other589.validWriteIdList; - tableId = other589.tableId; - __isset = other589.__isset; } CheckConstraintsRequest& CheckConstraintsRequest::operator=(const CheckConstraintsRequest& other590) { catName = other590.catName; db_name = other590.db_name; tbl_name = other590.tbl_name; - validWriteIdList = other590.validWriteIdList; - tableId = other590.tableId; - __isset = other590.__isset; return *this; } void CheckConstraintsRequest::printTo(std::ostream& out) const { @@ -16353,8 +16079,6 @@ void CheckConstraintsRequest::printTo(std::ostream& out) const { out << "catName=" << to_string(catName); out << ", " << "db_name=" << to_string(db_name); out << ", " << "tbl_name=" << to_string(tbl_name); - out << ", " << "validWriteIdList="; (__isset.validWriteIdList ? (out << to_string(validWriteIdList)) : (out << "")); - out << ", " << "tableId="; (__isset.tableId ? (out << to_string(tableId)) : (out << "")); out << ")"; } @@ -16486,16 +16210,6 @@ void AllTableConstraintsRequest::__set_tblName(const std::string& val) { void AllTableConstraintsRequest::__set_catName(const std::string& val) { this->catName = val; } - -void AllTableConstraintsRequest::__set_validWriteIdList(const std::string& val) { - this->validWriteIdList = val; -__isset.validWriteIdList = true; -} - -void AllTableConstraintsRequest::__set_tableId(const int64_t val) { - this->tableId = val; -__isset.tableId = true; -} std::ostream& operator<<(std::ostream& out, const AllTableConstraintsRequest& obj) { obj.printTo(out); @@ -16551,22 +16265,6 @@ uint32_t AllTableConstraintsRequest::read(::apache::thrift::protocol::TProtocol* xfer += iprot->skip(ftype); } break; - case 4: - if (ftype == ::apache::thrift::protocol::T_STRING) { - xfer += iprot->readString(this->validWriteIdList); - this->__isset.validWriteIdList = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 5: - if (ftype == ::apache::thrift::protocol::T_I64) { - xfer += iprot->readI64(this->tableId); - this->__isset.tableId = true; - } else { - xfer += iprot->skip(ftype); - } - break; default: xfer += iprot->skip(ftype); break; @@ -16602,16 +16300,6 @@ uint32_t AllTableConstraintsRequest::write(::apache::thrift::protocol::TProtocol xfer += oprot->writeString(this->catName); xfer += oprot->writeFieldEnd(); - if (this->__isset.validWriteIdList) { - xfer += oprot->writeFieldBegin("validWriteIdList", ::apache::thrift::protocol::T_STRING, 4); - xfer += oprot->writeString(this->validWriteIdList); - xfer += oprot->writeFieldEnd(); - } - if (this->__isset.tableId) { - xfer += oprot->writeFieldBegin("tableId", ::apache::thrift::protocol::T_I64, 5); - xfer += oprot->writeI64(this->tableId); - xfer += oprot->writeFieldEnd(); - } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); return xfer; @@ -16622,26 +16310,17 @@ void swap(AllTableConstraintsRequest &a, AllTableConstraintsRequest &b) { swap(a.dbName, b.dbName); swap(a.tblName, b.tblName); swap(a.catName, b.catName); - swap(a.validWriteIdList, b.validWriteIdList); - swap(a.tableId, b.tableId); - swap(a.__isset, b.__isset); } AllTableConstraintsRequest::AllTableConstraintsRequest(const AllTableConstraintsRequest& other599) { dbName = other599.dbName; tblName = other599.tblName; catName = other599.catName; - validWriteIdList = other599.validWriteIdList; - tableId = other599.tableId; - __isset = other599.__isset; } AllTableConstraintsRequest& AllTableConstraintsRequest::operator=(const AllTableConstraintsRequest& other600) { dbName = other600.dbName; tblName = other600.tblName; catName = other600.catName; - validWriteIdList = other600.validWriteIdList; - tableId = other600.tableId; - __isset = other600.__isset; return *this; } void AllTableConstraintsRequest::printTo(std::ostream& out) const { @@ -16650,8 +16329,6 @@ void AllTableConstraintsRequest::printTo(std::ostream& out) const { out << "dbName=" << to_string(dbName); out << ", " << "tblName=" << to_string(tblName); out << ", " << "catName=" << to_string(catName); - out << ", " << "validWriteIdList="; (__isset.validWriteIdList ? (out << to_string(validWriteIdList)) : (out << "")); - out << ", " << "tableId="; (__isset.tableId ? (out << to_string(tableId)) : (out << "")); out << ")"; } diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_types.h b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_types.h index 840f5bd31252..4603e837b2da 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_types.h +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_types.h @@ -6230,10 +6230,8 @@ void swap(Schema &a, Schema &b); std::ostream& operator<<(std::ostream& out, const Schema& obj); typedef struct _PrimaryKeysRequest__isset { - _PrimaryKeysRequest__isset() : catName(false), validWriteIdList(false), tableId(true) {} + _PrimaryKeysRequest__isset() : catName(false) {} bool catName :1; - bool validWriteIdList :1; - bool tableId :1; } _PrimaryKeysRequest__isset; class PrimaryKeysRequest : public virtual ::apache::thrift::TBase { @@ -6244,17 +6242,13 @@ class PrimaryKeysRequest : public virtual ::apache::thrift::TBase { PrimaryKeysRequest() noexcept : db_name(), tbl_name(), - catName(), - validWriteIdList(), - tableId(-1LL) { + catName() { } virtual ~PrimaryKeysRequest() noexcept; std::string db_name; std::string tbl_name; std::string catName; - std::string validWriteIdList; - int64_t tableId; _PrimaryKeysRequest__isset __isset; @@ -6264,10 +6258,6 @@ class PrimaryKeysRequest : public virtual ::apache::thrift::TBase { void __set_catName(const std::string& val); - void __set_validWriteIdList(const std::string& val); - - void __set_tableId(const int64_t val); - bool operator == (const PrimaryKeysRequest & rhs) const { if (!(db_name == rhs.db_name)) @@ -6278,14 +6268,6 @@ class PrimaryKeysRequest : public virtual ::apache::thrift::TBase { return false; else if (__isset.catName && !(catName == rhs.catName)) return false; - if (__isset.validWriteIdList != rhs.__isset.validWriteIdList) - return false; - else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList)) - return false; - if (__isset.tableId != rhs.__isset.tableId) - return false; - else if (__isset.tableId && !(tableId == rhs.tableId)) - return false; return true; } bool operator != (const PrimaryKeysRequest &rhs) const { @@ -6341,14 +6323,12 @@ void swap(PrimaryKeysResponse &a, PrimaryKeysResponse &b); std::ostream& operator<<(std::ostream& out, const PrimaryKeysResponse& obj); typedef struct _ForeignKeysRequest__isset { - _ForeignKeysRequest__isset() : parent_db_name(false), parent_tbl_name(false), foreign_db_name(false), foreign_tbl_name(false), catName(false), validWriteIdList(false), tableId(true) {} + _ForeignKeysRequest__isset() : parent_db_name(false), parent_tbl_name(false), foreign_db_name(false), foreign_tbl_name(false), catName(false) {} bool parent_db_name :1; bool parent_tbl_name :1; bool foreign_db_name :1; bool foreign_tbl_name :1; bool catName :1; - bool validWriteIdList :1; - bool tableId :1; } _ForeignKeysRequest__isset; class ForeignKeysRequest : public virtual ::apache::thrift::TBase { @@ -6361,9 +6341,7 @@ class ForeignKeysRequest : public virtual ::apache::thrift::TBase { parent_tbl_name(), foreign_db_name(), foreign_tbl_name(), - catName(), - validWriteIdList(), - tableId(-1LL) { + catName() { } virtual ~ForeignKeysRequest() noexcept; @@ -6372,8 +6350,6 @@ class ForeignKeysRequest : public virtual ::apache::thrift::TBase { std::string foreign_db_name; std::string foreign_tbl_name; std::string catName; - std::string validWriteIdList; - int64_t tableId; _ForeignKeysRequest__isset __isset; @@ -6387,10 +6363,6 @@ class ForeignKeysRequest : public virtual ::apache::thrift::TBase { void __set_catName(const std::string& val); - void __set_validWriteIdList(const std::string& val); - - void __set_tableId(const int64_t val); - bool operator == (const ForeignKeysRequest & rhs) const { if (!(parent_db_name == rhs.parent_db_name)) @@ -6405,14 +6377,6 @@ class ForeignKeysRequest : public virtual ::apache::thrift::TBase { return false; else if (__isset.catName && !(catName == rhs.catName)) return false; - if (__isset.validWriteIdList != rhs.__isset.validWriteIdList) - return false; - else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList)) - return false; - if (__isset.tableId != rhs.__isset.tableId) - return false; - else if (__isset.tableId && !(tableId == rhs.tableId)) - return false; return true; } bool operator != (const ForeignKeysRequest &rhs) const { @@ -6467,11 +6431,6 @@ void swap(ForeignKeysResponse &a, ForeignKeysResponse &b); std::ostream& operator<<(std::ostream& out, const ForeignKeysResponse& obj); -typedef struct _UniqueConstraintsRequest__isset { - _UniqueConstraintsRequest__isset() : validWriteIdList(false), tableId(true) {} - bool validWriteIdList :1; - bool tableId :1; -} _UniqueConstraintsRequest__isset; class UniqueConstraintsRequest : public virtual ::apache::thrift::TBase { public: @@ -6481,19 +6440,13 @@ class UniqueConstraintsRequest : public virtual ::apache::thrift::TBase { UniqueConstraintsRequest() noexcept : catName(), db_name(), - tbl_name(), - validWriteIdList(), - tableId(-1LL) { + tbl_name() { } virtual ~UniqueConstraintsRequest() noexcept; std::string catName; std::string db_name; std::string tbl_name; - std::string validWriteIdList; - int64_t tableId; - - _UniqueConstraintsRequest__isset __isset; void __set_catName(const std::string& val); @@ -6501,10 +6454,6 @@ class UniqueConstraintsRequest : public virtual ::apache::thrift::TBase { void __set_tbl_name(const std::string& val); - void __set_validWriteIdList(const std::string& val); - - void __set_tableId(const int64_t val); - bool operator == (const UniqueConstraintsRequest & rhs) const { if (!(catName == rhs.catName)) @@ -6513,14 +6462,6 @@ class UniqueConstraintsRequest : public virtual ::apache::thrift::TBase { return false; if (!(tbl_name == rhs.tbl_name)) return false; - if (__isset.validWriteIdList != rhs.__isset.validWriteIdList) - return false; - else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList)) - return false; - if (__isset.tableId != rhs.__isset.tableId) - return false; - else if (__isset.tableId && !(tableId == rhs.tableId)) - return false; return true; } bool operator != (const UniqueConstraintsRequest &rhs) const { @@ -6575,11 +6516,6 @@ void swap(UniqueConstraintsResponse &a, UniqueConstraintsResponse &b); std::ostream& operator<<(std::ostream& out, const UniqueConstraintsResponse& obj); -typedef struct _NotNullConstraintsRequest__isset { - _NotNullConstraintsRequest__isset() : validWriteIdList(false), tableId(true) {} - bool validWriteIdList :1; - bool tableId :1; -} _NotNullConstraintsRequest__isset; class NotNullConstraintsRequest : public virtual ::apache::thrift::TBase { public: @@ -6589,19 +6525,13 @@ class NotNullConstraintsRequest : public virtual ::apache::thrift::TBase { NotNullConstraintsRequest() noexcept : catName(), db_name(), - tbl_name(), - validWriteIdList(), - tableId(-1LL) { + tbl_name() { } virtual ~NotNullConstraintsRequest() noexcept; std::string catName; std::string db_name; std::string tbl_name; - std::string validWriteIdList; - int64_t tableId; - - _NotNullConstraintsRequest__isset __isset; void __set_catName(const std::string& val); @@ -6609,10 +6539,6 @@ class NotNullConstraintsRequest : public virtual ::apache::thrift::TBase { void __set_tbl_name(const std::string& val); - void __set_validWriteIdList(const std::string& val); - - void __set_tableId(const int64_t val); - bool operator == (const NotNullConstraintsRequest & rhs) const { if (!(catName == rhs.catName)) @@ -6621,14 +6547,6 @@ class NotNullConstraintsRequest : public virtual ::apache::thrift::TBase { return false; if (!(tbl_name == rhs.tbl_name)) return false; - if (__isset.validWriteIdList != rhs.__isset.validWriteIdList) - return false; - else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList)) - return false; - if (__isset.tableId != rhs.__isset.tableId) - return false; - else if (__isset.tableId && !(tableId == rhs.tableId)) - return false; return true; } bool operator != (const NotNullConstraintsRequest &rhs) const { @@ -6683,11 +6601,6 @@ void swap(NotNullConstraintsResponse &a, NotNullConstraintsResponse &b); std::ostream& operator<<(std::ostream& out, const NotNullConstraintsResponse& obj); -typedef struct _DefaultConstraintsRequest__isset { - _DefaultConstraintsRequest__isset() : validWriteIdList(false), tableId(true) {} - bool validWriteIdList :1; - bool tableId :1; -} _DefaultConstraintsRequest__isset; class DefaultConstraintsRequest : public virtual ::apache::thrift::TBase { public: @@ -6697,19 +6610,13 @@ class DefaultConstraintsRequest : public virtual ::apache::thrift::TBase { DefaultConstraintsRequest() noexcept : catName(), db_name(), - tbl_name(), - validWriteIdList(), - tableId(-1LL) { + tbl_name() { } virtual ~DefaultConstraintsRequest() noexcept; std::string catName; std::string db_name; std::string tbl_name; - std::string validWriteIdList; - int64_t tableId; - - _DefaultConstraintsRequest__isset __isset; void __set_catName(const std::string& val); @@ -6717,10 +6624,6 @@ class DefaultConstraintsRequest : public virtual ::apache::thrift::TBase { void __set_tbl_name(const std::string& val); - void __set_validWriteIdList(const std::string& val); - - void __set_tableId(const int64_t val); - bool operator == (const DefaultConstraintsRequest & rhs) const { if (!(catName == rhs.catName)) @@ -6729,14 +6632,6 @@ class DefaultConstraintsRequest : public virtual ::apache::thrift::TBase { return false; if (!(tbl_name == rhs.tbl_name)) return false; - if (__isset.validWriteIdList != rhs.__isset.validWriteIdList) - return false; - else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList)) - return false; - if (__isset.tableId != rhs.__isset.tableId) - return false; - else if (__isset.tableId && !(tableId == rhs.tableId)) - return false; return true; } bool operator != (const DefaultConstraintsRequest &rhs) const { @@ -6791,11 +6686,6 @@ void swap(DefaultConstraintsResponse &a, DefaultConstraintsResponse &b); std::ostream& operator<<(std::ostream& out, const DefaultConstraintsResponse& obj); -typedef struct _CheckConstraintsRequest__isset { - _CheckConstraintsRequest__isset() : validWriteIdList(false), tableId(true) {} - bool validWriteIdList :1; - bool tableId :1; -} _CheckConstraintsRequest__isset; class CheckConstraintsRequest : public virtual ::apache::thrift::TBase { public: @@ -6805,19 +6695,13 @@ class CheckConstraintsRequest : public virtual ::apache::thrift::TBase { CheckConstraintsRequest() noexcept : catName(), db_name(), - tbl_name(), - validWriteIdList(), - tableId(-1LL) { + tbl_name() { } virtual ~CheckConstraintsRequest() noexcept; std::string catName; std::string db_name; std::string tbl_name; - std::string validWriteIdList; - int64_t tableId; - - _CheckConstraintsRequest__isset __isset; void __set_catName(const std::string& val); @@ -6825,10 +6709,6 @@ class CheckConstraintsRequest : public virtual ::apache::thrift::TBase { void __set_tbl_name(const std::string& val); - void __set_validWriteIdList(const std::string& val); - - void __set_tableId(const int64_t val); - bool operator == (const CheckConstraintsRequest & rhs) const { if (!(catName == rhs.catName)) @@ -6837,14 +6717,6 @@ class CheckConstraintsRequest : public virtual ::apache::thrift::TBase { return false; if (!(tbl_name == rhs.tbl_name)) return false; - if (__isset.validWriteIdList != rhs.__isset.validWriteIdList) - return false; - else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList)) - return false; - if (__isset.tableId != rhs.__isset.tableId) - return false; - else if (__isset.tableId && !(tableId == rhs.tableId)) - return false; return true; } bool operator != (const CheckConstraintsRequest &rhs) const { @@ -6899,11 +6771,6 @@ void swap(CheckConstraintsResponse &a, CheckConstraintsResponse &b); std::ostream& operator<<(std::ostream& out, const CheckConstraintsResponse& obj); -typedef struct _AllTableConstraintsRequest__isset { - _AllTableConstraintsRequest__isset() : validWriteIdList(false), tableId(true) {} - bool validWriteIdList :1; - bool tableId :1; -} _AllTableConstraintsRequest__isset; class AllTableConstraintsRequest : public virtual ::apache::thrift::TBase { public: @@ -6913,19 +6780,13 @@ class AllTableConstraintsRequest : public virtual ::apache::thrift::TBase { AllTableConstraintsRequest() noexcept : dbName(), tblName(), - catName(), - validWriteIdList(), - tableId(-1LL) { + catName() { } virtual ~AllTableConstraintsRequest() noexcept; std::string dbName; std::string tblName; std::string catName; - std::string validWriteIdList; - int64_t tableId; - - _AllTableConstraintsRequest__isset __isset; void __set_dbName(const std::string& val); @@ -6933,10 +6794,6 @@ class AllTableConstraintsRequest : public virtual ::apache::thrift::TBase { void __set_catName(const std::string& val); - void __set_validWriteIdList(const std::string& val); - - void __set_tableId(const int64_t val); - bool operator == (const AllTableConstraintsRequest & rhs) const { if (!(dbName == rhs.dbName)) @@ -6945,14 +6802,6 @@ class AllTableConstraintsRequest : public virtual ::apache::thrift::TBase { return false; if (!(catName == rhs.catName)) return false; - if (__isset.validWriteIdList != rhs.__isset.validWriteIdList) - return false; - else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList)) - return false; - if (__isset.tableId != rhs.__isset.tableId) - return false; - else if (__isset.tableId && !(tableId == rhs.tableId)) - return false; return true; } bool operator != (const AllTableConstraintsRequest &rhs) const { diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllTableConstraintsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllTableConstraintsRequest.java index 136d6384ef27..e3e057a768d1 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllTableConstraintsRequest.java +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllTableConstraintsRequest.java @@ -14,8 +14,6 @@ private static final org.apache.thrift.protocol.TField DB_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("dbName", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField TBL_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tblName", org.apache.thrift.protocol.TType.STRING, (short)2); 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)3); - 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)4); - private static final org.apache.thrift.protocol.TField TABLE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("tableId", org.apache.thrift.protocol.TType.I64, (short)5); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new AllTableConstraintsRequestStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new AllTableConstraintsRequestTupleSchemeFactory(); @@ -23,16 +21,12 @@ private @org.apache.thrift.annotation.Nullable java.lang.String dbName; // required private @org.apache.thrift.annotation.Nullable java.lang.String tblName; // required private @org.apache.thrift.annotation.Nullable java.lang.String catName; // required - private @org.apache.thrift.annotation.Nullable java.lang.String validWriteIdList; // optional - private long tableId; // 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 { DB_NAME((short)1, "dbName"), TBL_NAME((short)2, "tblName"), - CAT_NAME((short)3, "catName"), - VALID_WRITE_ID_LIST((short)4, "validWriteIdList"), - TABLE_ID((short)5, "tableId"); + CAT_NAME((short)3, "catName"); private static final java.util.Map byName = new java.util.HashMap(); @@ -54,10 +48,6 @@ public static _Fields findByThriftId(int fieldId) { return TBL_NAME; case 3: // CAT_NAME return CAT_NAME; - case 4: // VALID_WRITE_ID_LIST - return VALID_WRITE_ID_LIST; - case 5: // TABLE_ID - return TABLE_ID; default: return null; } @@ -99,9 +89,6 @@ public java.lang.String getFieldName() { } // isset id assignments - private static final int __TABLEID_ISSET_ID = 0; - private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.VALID_WRITE_ID_LIST,_Fields.TABLE_ID}; public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -111,17 +98,11 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.CAT_NAME, new org.apache.thrift.meta_data.FieldMetaData("catName", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - 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))); - tmpMap.put(_Fields.TABLE_ID, new org.apache.thrift.meta_data.FieldMetaData("tableId", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AllTableConstraintsRequest.class, metaDataMap); } public AllTableConstraintsRequest() { - this.tableId = -1L; - } public AllTableConstraintsRequest( @@ -139,7 +120,6 @@ public AllTableConstraintsRequest( * Performs a deep copy on other. */ public AllTableConstraintsRequest(AllTableConstraintsRequest other) { - __isset_bitfield = other.__isset_bitfield; if (other.isSetDbName()) { this.dbName = other.dbName; } @@ -149,10 +129,6 @@ public AllTableConstraintsRequest(AllTableConstraintsRequest other) { if (other.isSetCatName()) { this.catName = other.catName; } - if (other.isSetValidWriteIdList()) { - this.validWriteIdList = other.validWriteIdList; - } - this.tableId = other.tableId; } public AllTableConstraintsRequest deepCopy() { @@ -164,9 +140,6 @@ public void clear() { this.dbName = null; this.tblName = null; this.catName = null; - this.validWriteIdList = null; - this.tableId = -1L; - } @org.apache.thrift.annotation.Nullable @@ -241,52 +214,6 @@ public void setCatNameIsSet(boolean value) { } } - @org.apache.thrift.annotation.Nullable - public java.lang.String getValidWriteIdList() { - return this.validWriteIdList; - } - - public void setValidWriteIdList(@org.apache.thrift.annotation.Nullable java.lang.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 long getTableId() { - return this.tableId; - } - - public void setTableId(long tableId) { - this.tableId = tableId; - setTableIdIsSet(true); - } - - public void unsetTableId() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TABLEID_ISSET_ID); - } - - /** Returns true if field tableId is set (has been assigned a value) and false otherwise */ - public boolean isSetTableId() { - return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TABLEID_ISSET_ID); - } - - public void setTableIdIsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TABLEID_ISSET_ID, value); - } - public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case DB_NAME: @@ -313,22 +240,6 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case VALID_WRITE_ID_LIST: - if (value == null) { - unsetValidWriteIdList(); - } else { - setValidWriteIdList((java.lang.String)value); - } - break; - - case TABLE_ID: - if (value == null) { - unsetTableId(); - } else { - setTableId((java.lang.Long)value); - } - break; - } } @@ -344,12 +255,6 @@ public java.lang.Object getFieldValue(_Fields field) { case CAT_NAME: return getCatName(); - case VALID_WRITE_ID_LIST: - return getValidWriteIdList(); - - case TABLE_ID: - return getTableId(); - } throw new java.lang.IllegalStateException(); } @@ -367,10 +272,6 @@ public boolean isSet(_Fields field) { return isSetTblName(); case CAT_NAME: return isSetCatName(); - case VALID_WRITE_ID_LIST: - return isSetValidWriteIdList(); - case TABLE_ID: - return isSetTableId(); } throw new java.lang.IllegalStateException(); } @@ -415,24 +316,6 @@ public boolean equals(AllTableConstraintsRequest that) { 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; - } - - boolean this_present_tableId = true && this.isSetTableId(); - boolean that_present_tableId = true && that.isSetTableId(); - if (this_present_tableId || that_present_tableId) { - if (!(this_present_tableId && that_present_tableId)) - return false; - if (this.tableId != that.tableId) - return false; - } - return true; } @@ -452,14 +335,6 @@ public int hashCode() { if (isSetCatName()) hashCode = hashCode * 8191 + catName.hashCode(); - hashCode = hashCode * 8191 + ((isSetValidWriteIdList()) ? 131071 : 524287); - if (isSetValidWriteIdList()) - hashCode = hashCode * 8191 + validWriteIdList.hashCode(); - - hashCode = hashCode * 8191 + ((isSetTableId()) ? 131071 : 524287); - if (isSetTableId()) - hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(tableId); - return hashCode; } @@ -501,26 +376,6 @@ public int compareTo(AllTableConstraintsRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetValidWriteIdList(), other.isSetValidWriteIdList()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetValidWriteIdList()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.validWriteIdList, other.validWriteIdList); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.compare(isSetTableId(), other.isSetTableId()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTableId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableId, other.tableId); - if (lastComparison != 0) { - return lastComparison; - } - } return 0; } @@ -565,22 +420,6 @@ public java.lang.String toString() { sb.append(this.catName); } 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; - } - if (isSetTableId()) { - if (!first) sb.append(", "); - sb.append("tableId:"); - sb.append(this.tableId); - first = false; - } sb.append(")"); return sb.toString(); } @@ -612,8 +451,6 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { - // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. - __isset_bitfield = 0; read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); @@ -662,22 +499,6 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, AllTableConstraints org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // 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; - case 5: // TABLE_ID - if (schemeField.type == org.apache.thrift.protocol.TType.I64) { - struct.tableId = iprot.readI64(); - struct.setTableIdIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -706,18 +527,6 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, AllTableConstraint oprot.writeString(struct.catName); oprot.writeFieldEnd(); } - if (struct.validWriteIdList != null) { - if (struct.isSetValidWriteIdList()) { - oprot.writeFieldBegin(VALID_WRITE_ID_LIST_FIELD_DESC); - oprot.writeString(struct.validWriteIdList); - oprot.writeFieldEnd(); - } - } - if (struct.isSetTableId()) { - oprot.writeFieldBegin(TABLE_ID_FIELD_DESC); - oprot.writeI64(struct.tableId); - oprot.writeFieldEnd(); - } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -738,20 +547,6 @@ public void write(org.apache.thrift.protocol.TProtocol prot, AllTableConstraints oprot.writeString(struct.dbName); oprot.writeString(struct.tblName); oprot.writeString(struct.catName); - java.util.BitSet optionals = new java.util.BitSet(); - if (struct.isSetValidWriteIdList()) { - optionals.set(0); - } - if (struct.isSetTableId()) { - optionals.set(1); - } - oprot.writeBitSet(optionals, 2); - if (struct.isSetValidWriteIdList()) { - oprot.writeString(struct.validWriteIdList); - } - if (struct.isSetTableId()) { - oprot.writeI64(struct.tableId); - } } @Override @@ -763,15 +558,6 @@ public void read(org.apache.thrift.protocol.TProtocol prot, AllTableConstraintsR struct.setTblNameIsSet(true); struct.catName = iprot.readString(); struct.setCatNameIsSet(true); - java.util.BitSet incoming = iprot.readBitSet(2); - if (incoming.get(0)) { - struct.validWriteIdList = iprot.readString(); - struct.setValidWriteIdListIsSet(true); - } - if (incoming.get(1)) { - struct.tableId = iprot.readI64(); - struct.setTableIdIsSet(true); - } } } diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckConstraintsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckConstraintsRequest.java index 9f0e0f265c5f..8ddc8ff8c823 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckConstraintsRequest.java +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckConstraintsRequest.java @@ -14,8 +14,6 @@ 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)1); private static final org.apache.thrift.protocol.TField DB_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("db_name", org.apache.thrift.protocol.TType.STRING, (short)2); private static final org.apache.thrift.protocol.TField TBL_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tbl_name", org.apache.thrift.protocol.TType.STRING, (short)3); - 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)4); - private static final org.apache.thrift.protocol.TField TABLE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("tableId", org.apache.thrift.protocol.TType.I64, (short)5); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new CheckConstraintsRequestStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new CheckConstraintsRequestTupleSchemeFactory(); @@ -23,16 +21,12 @@ private @org.apache.thrift.annotation.Nullable java.lang.String catName; // required private @org.apache.thrift.annotation.Nullable java.lang.String db_name; // required private @org.apache.thrift.annotation.Nullable java.lang.String tbl_name; // required - private @org.apache.thrift.annotation.Nullable java.lang.String validWriteIdList; // optional - private long tableId; // 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 { CAT_NAME((short)1, "catName"), DB_NAME((short)2, "db_name"), - TBL_NAME((short)3, "tbl_name"), - VALID_WRITE_ID_LIST((short)4, "validWriteIdList"), - TABLE_ID((short)5, "tableId"); + TBL_NAME((short)3, "tbl_name"); private static final java.util.Map byName = new java.util.HashMap(); @@ -54,10 +48,6 @@ public static _Fields findByThriftId(int fieldId) { return DB_NAME; case 3: // TBL_NAME return TBL_NAME; - case 4: // VALID_WRITE_ID_LIST - return VALID_WRITE_ID_LIST; - case 5: // TABLE_ID - return TABLE_ID; default: return null; } @@ -99,9 +89,6 @@ public java.lang.String getFieldName() { } // isset id assignments - private static final int __TABLEID_ISSET_ID = 0; - private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.VALID_WRITE_ID_LIST,_Fields.TABLE_ID}; public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -111,17 +98,11 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.TBL_NAME, new org.apache.thrift.meta_data.FieldMetaData("tbl_name", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - 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))); - tmpMap.put(_Fields.TABLE_ID, new org.apache.thrift.meta_data.FieldMetaData("tableId", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(CheckConstraintsRequest.class, metaDataMap); } public CheckConstraintsRequest() { - this.tableId = -1L; - } public CheckConstraintsRequest( @@ -139,7 +120,6 @@ public CheckConstraintsRequest( * Performs a deep copy on other. */ public CheckConstraintsRequest(CheckConstraintsRequest other) { - __isset_bitfield = other.__isset_bitfield; if (other.isSetCatName()) { this.catName = other.catName; } @@ -149,10 +129,6 @@ public CheckConstraintsRequest(CheckConstraintsRequest other) { if (other.isSetTbl_name()) { this.tbl_name = other.tbl_name; } - if (other.isSetValidWriteIdList()) { - this.validWriteIdList = other.validWriteIdList; - } - this.tableId = other.tableId; } public CheckConstraintsRequest deepCopy() { @@ -164,9 +140,6 @@ public void clear() { this.catName = null; this.db_name = null; this.tbl_name = null; - this.validWriteIdList = null; - this.tableId = -1L; - } @org.apache.thrift.annotation.Nullable @@ -241,52 +214,6 @@ public void setTbl_nameIsSet(boolean value) { } } - @org.apache.thrift.annotation.Nullable - public java.lang.String getValidWriteIdList() { - return this.validWriteIdList; - } - - public void setValidWriteIdList(@org.apache.thrift.annotation.Nullable java.lang.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 long getTableId() { - return this.tableId; - } - - public void setTableId(long tableId) { - this.tableId = tableId; - setTableIdIsSet(true); - } - - public void unsetTableId() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TABLEID_ISSET_ID); - } - - /** Returns true if field tableId is set (has been assigned a value) and false otherwise */ - public boolean isSetTableId() { - return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TABLEID_ISSET_ID); - } - - public void setTableIdIsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TABLEID_ISSET_ID, value); - } - public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case CAT_NAME: @@ -313,22 +240,6 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case VALID_WRITE_ID_LIST: - if (value == null) { - unsetValidWriteIdList(); - } else { - setValidWriteIdList((java.lang.String)value); - } - break; - - case TABLE_ID: - if (value == null) { - unsetTableId(); - } else { - setTableId((java.lang.Long)value); - } - break; - } } @@ -344,12 +255,6 @@ public java.lang.Object getFieldValue(_Fields field) { case TBL_NAME: return getTbl_name(); - case VALID_WRITE_ID_LIST: - return getValidWriteIdList(); - - case TABLE_ID: - return getTableId(); - } throw new java.lang.IllegalStateException(); } @@ -367,10 +272,6 @@ public boolean isSet(_Fields field) { return isSetDb_name(); case TBL_NAME: return isSetTbl_name(); - case VALID_WRITE_ID_LIST: - return isSetValidWriteIdList(); - case TABLE_ID: - return isSetTableId(); } throw new java.lang.IllegalStateException(); } @@ -415,24 +316,6 @@ public boolean equals(CheckConstraintsRequest that) { 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; - } - - boolean this_present_tableId = true && this.isSetTableId(); - boolean that_present_tableId = true && that.isSetTableId(); - if (this_present_tableId || that_present_tableId) { - if (!(this_present_tableId && that_present_tableId)) - return false; - if (this.tableId != that.tableId) - return false; - } - return true; } @@ -452,14 +335,6 @@ public int hashCode() { if (isSetTbl_name()) hashCode = hashCode * 8191 + tbl_name.hashCode(); - hashCode = hashCode * 8191 + ((isSetValidWriteIdList()) ? 131071 : 524287); - if (isSetValidWriteIdList()) - hashCode = hashCode * 8191 + validWriteIdList.hashCode(); - - hashCode = hashCode * 8191 + ((isSetTableId()) ? 131071 : 524287); - if (isSetTableId()) - hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(tableId); - return hashCode; } @@ -501,26 +376,6 @@ public int compareTo(CheckConstraintsRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetValidWriteIdList(), other.isSetValidWriteIdList()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetValidWriteIdList()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.validWriteIdList, other.validWriteIdList); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.compare(isSetTableId(), other.isSetTableId()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTableId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableId, other.tableId); - if (lastComparison != 0) { - return lastComparison; - } - } return 0; } @@ -565,22 +420,6 @@ public java.lang.String toString() { sb.append(this.tbl_name); } 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; - } - if (isSetTableId()) { - if (!first) sb.append(", "); - sb.append("tableId:"); - sb.append(this.tableId); - first = false; - } sb.append(")"); return sb.toString(); } @@ -612,8 +451,6 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { - // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. - __isset_bitfield = 0; read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); @@ -662,22 +499,6 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CheckConstraintsReq org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // 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; - case 5: // TABLE_ID - if (schemeField.type == org.apache.thrift.protocol.TType.I64) { - struct.tableId = iprot.readI64(); - struct.setTableIdIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -706,18 +527,6 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CheckConstraintsRe oprot.writeString(struct.tbl_name); oprot.writeFieldEnd(); } - if (struct.validWriteIdList != null) { - if (struct.isSetValidWriteIdList()) { - oprot.writeFieldBegin(VALID_WRITE_ID_LIST_FIELD_DESC); - oprot.writeString(struct.validWriteIdList); - oprot.writeFieldEnd(); - } - } - if (struct.isSetTableId()) { - oprot.writeFieldBegin(TABLE_ID_FIELD_DESC); - oprot.writeI64(struct.tableId); - oprot.writeFieldEnd(); - } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -738,20 +547,6 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CheckConstraintsReq oprot.writeString(struct.catName); oprot.writeString(struct.db_name); oprot.writeString(struct.tbl_name); - java.util.BitSet optionals = new java.util.BitSet(); - if (struct.isSetValidWriteIdList()) { - optionals.set(0); - } - if (struct.isSetTableId()) { - optionals.set(1); - } - oprot.writeBitSet(optionals, 2); - if (struct.isSetValidWriteIdList()) { - oprot.writeString(struct.validWriteIdList); - } - if (struct.isSetTableId()) { - oprot.writeI64(struct.tableId); - } } @Override @@ -763,15 +558,6 @@ public void read(org.apache.thrift.protocol.TProtocol prot, CheckConstraintsRequ struct.setDb_nameIsSet(true); struct.tbl_name = iprot.readString(); struct.setTbl_nameIsSet(true); - java.util.BitSet incoming = iprot.readBitSet(2); - if (incoming.get(0)) { - struct.validWriteIdList = iprot.readString(); - struct.setValidWriteIdListIsSet(true); - } - if (incoming.get(1)) { - struct.tableId = iprot.readI64(); - struct.setTableIdIsSet(true); - } } } diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DefaultConstraintsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DefaultConstraintsRequest.java index 86b6a340cc4b..dbd4523d4e12 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DefaultConstraintsRequest.java +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DefaultConstraintsRequest.java @@ -14,8 +14,6 @@ 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)1); private static final org.apache.thrift.protocol.TField DB_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("db_name", org.apache.thrift.protocol.TType.STRING, (short)2); private static final org.apache.thrift.protocol.TField TBL_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tbl_name", org.apache.thrift.protocol.TType.STRING, (short)3); - 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)4); - private static final org.apache.thrift.protocol.TField TABLE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("tableId", org.apache.thrift.protocol.TType.I64, (short)5); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new DefaultConstraintsRequestStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new DefaultConstraintsRequestTupleSchemeFactory(); @@ -23,16 +21,12 @@ private @org.apache.thrift.annotation.Nullable java.lang.String catName; // required private @org.apache.thrift.annotation.Nullable java.lang.String db_name; // required private @org.apache.thrift.annotation.Nullable java.lang.String tbl_name; // required - private @org.apache.thrift.annotation.Nullable java.lang.String validWriteIdList; // optional - private long tableId; // 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 { CAT_NAME((short)1, "catName"), DB_NAME((short)2, "db_name"), - TBL_NAME((short)3, "tbl_name"), - VALID_WRITE_ID_LIST((short)4, "validWriteIdList"), - TABLE_ID((short)5, "tableId"); + TBL_NAME((short)3, "tbl_name"); private static final java.util.Map byName = new java.util.HashMap(); @@ -54,10 +48,6 @@ public static _Fields findByThriftId(int fieldId) { return DB_NAME; case 3: // TBL_NAME return TBL_NAME; - case 4: // VALID_WRITE_ID_LIST - return VALID_WRITE_ID_LIST; - case 5: // TABLE_ID - return TABLE_ID; default: return null; } @@ -99,9 +89,6 @@ public java.lang.String getFieldName() { } // isset id assignments - private static final int __TABLEID_ISSET_ID = 0; - private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.VALID_WRITE_ID_LIST,_Fields.TABLE_ID}; public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -111,17 +98,11 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.TBL_NAME, new org.apache.thrift.meta_data.FieldMetaData("tbl_name", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - 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))); - tmpMap.put(_Fields.TABLE_ID, new org.apache.thrift.meta_data.FieldMetaData("tableId", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DefaultConstraintsRequest.class, metaDataMap); } public DefaultConstraintsRequest() { - this.tableId = -1L; - } public DefaultConstraintsRequest( @@ -139,7 +120,6 @@ public DefaultConstraintsRequest( * Performs a deep copy on other. */ public DefaultConstraintsRequest(DefaultConstraintsRequest other) { - __isset_bitfield = other.__isset_bitfield; if (other.isSetCatName()) { this.catName = other.catName; } @@ -149,10 +129,6 @@ public DefaultConstraintsRequest(DefaultConstraintsRequest other) { if (other.isSetTbl_name()) { this.tbl_name = other.tbl_name; } - if (other.isSetValidWriteIdList()) { - this.validWriteIdList = other.validWriteIdList; - } - this.tableId = other.tableId; } public DefaultConstraintsRequest deepCopy() { @@ -164,9 +140,6 @@ public void clear() { this.catName = null; this.db_name = null; this.tbl_name = null; - this.validWriteIdList = null; - this.tableId = -1L; - } @org.apache.thrift.annotation.Nullable @@ -241,52 +214,6 @@ public void setTbl_nameIsSet(boolean value) { } } - @org.apache.thrift.annotation.Nullable - public java.lang.String getValidWriteIdList() { - return this.validWriteIdList; - } - - public void setValidWriteIdList(@org.apache.thrift.annotation.Nullable java.lang.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 long getTableId() { - return this.tableId; - } - - public void setTableId(long tableId) { - this.tableId = tableId; - setTableIdIsSet(true); - } - - public void unsetTableId() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TABLEID_ISSET_ID); - } - - /** Returns true if field tableId is set (has been assigned a value) and false otherwise */ - public boolean isSetTableId() { - return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TABLEID_ISSET_ID); - } - - public void setTableIdIsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TABLEID_ISSET_ID, value); - } - public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case CAT_NAME: @@ -313,22 +240,6 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case VALID_WRITE_ID_LIST: - if (value == null) { - unsetValidWriteIdList(); - } else { - setValidWriteIdList((java.lang.String)value); - } - break; - - case TABLE_ID: - if (value == null) { - unsetTableId(); - } else { - setTableId((java.lang.Long)value); - } - break; - } } @@ -344,12 +255,6 @@ public java.lang.Object getFieldValue(_Fields field) { case TBL_NAME: return getTbl_name(); - case VALID_WRITE_ID_LIST: - return getValidWriteIdList(); - - case TABLE_ID: - return getTableId(); - } throw new java.lang.IllegalStateException(); } @@ -367,10 +272,6 @@ public boolean isSet(_Fields field) { return isSetDb_name(); case TBL_NAME: return isSetTbl_name(); - case VALID_WRITE_ID_LIST: - return isSetValidWriteIdList(); - case TABLE_ID: - return isSetTableId(); } throw new java.lang.IllegalStateException(); } @@ -415,24 +316,6 @@ public boolean equals(DefaultConstraintsRequest that) { 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; - } - - boolean this_present_tableId = true && this.isSetTableId(); - boolean that_present_tableId = true && that.isSetTableId(); - if (this_present_tableId || that_present_tableId) { - if (!(this_present_tableId && that_present_tableId)) - return false; - if (this.tableId != that.tableId) - return false; - } - return true; } @@ -452,14 +335,6 @@ public int hashCode() { if (isSetTbl_name()) hashCode = hashCode * 8191 + tbl_name.hashCode(); - hashCode = hashCode * 8191 + ((isSetValidWriteIdList()) ? 131071 : 524287); - if (isSetValidWriteIdList()) - hashCode = hashCode * 8191 + validWriteIdList.hashCode(); - - hashCode = hashCode * 8191 + ((isSetTableId()) ? 131071 : 524287); - if (isSetTableId()) - hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(tableId); - return hashCode; } @@ -501,26 +376,6 @@ public int compareTo(DefaultConstraintsRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetValidWriteIdList(), other.isSetValidWriteIdList()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetValidWriteIdList()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.validWriteIdList, other.validWriteIdList); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.compare(isSetTableId(), other.isSetTableId()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTableId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableId, other.tableId); - if (lastComparison != 0) { - return lastComparison; - } - } return 0; } @@ -565,22 +420,6 @@ public java.lang.String toString() { sb.append(this.tbl_name); } 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; - } - if (isSetTableId()) { - if (!first) sb.append(", "); - sb.append("tableId:"); - sb.append(this.tableId); - first = false; - } sb.append(")"); return sb.toString(); } @@ -612,8 +451,6 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { - // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. - __isset_bitfield = 0; read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); @@ -662,22 +499,6 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, DefaultConstraintsR org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // 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; - case 5: // TABLE_ID - if (schemeField.type == org.apache.thrift.protocol.TType.I64) { - struct.tableId = iprot.readI64(); - struct.setTableIdIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -706,18 +527,6 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, DefaultConstraints oprot.writeString(struct.tbl_name); oprot.writeFieldEnd(); } - if (struct.validWriteIdList != null) { - if (struct.isSetValidWriteIdList()) { - oprot.writeFieldBegin(VALID_WRITE_ID_LIST_FIELD_DESC); - oprot.writeString(struct.validWriteIdList); - oprot.writeFieldEnd(); - } - } - if (struct.isSetTableId()) { - oprot.writeFieldBegin(TABLE_ID_FIELD_DESC); - oprot.writeI64(struct.tableId); - oprot.writeFieldEnd(); - } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -738,20 +547,6 @@ public void write(org.apache.thrift.protocol.TProtocol prot, DefaultConstraintsR oprot.writeString(struct.catName); oprot.writeString(struct.db_name); oprot.writeString(struct.tbl_name); - java.util.BitSet optionals = new java.util.BitSet(); - if (struct.isSetValidWriteIdList()) { - optionals.set(0); - } - if (struct.isSetTableId()) { - optionals.set(1); - } - oprot.writeBitSet(optionals, 2); - if (struct.isSetValidWriteIdList()) { - oprot.writeString(struct.validWriteIdList); - } - if (struct.isSetTableId()) { - oprot.writeI64(struct.tableId); - } } @Override @@ -763,15 +558,6 @@ public void read(org.apache.thrift.protocol.TProtocol prot, DefaultConstraintsRe struct.setDb_nameIsSet(true); struct.tbl_name = iprot.readString(); struct.setTbl_nameIsSet(true); - java.util.BitSet incoming = iprot.readBitSet(2); - if (incoming.get(0)) { - struct.validWriteIdList = iprot.readString(); - struct.setValidWriteIdListIsSet(true); - } - if (incoming.get(1)) { - struct.tableId = iprot.readI64(); - struct.setTableIdIsSet(true); - } } } diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysRequest.java index e8fc124a5b4c..6d10b2a68ff6 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysRequest.java +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysRequest.java @@ -16,8 +16,6 @@ private static final org.apache.thrift.protocol.TField FOREIGN_DB_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("foreign_db_name", org.apache.thrift.protocol.TType.STRING, (short)3); private static final org.apache.thrift.protocol.TField FOREIGN_TBL_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("foreign_tbl_name", org.apache.thrift.protocol.TType.STRING, (short)4); 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)5); - 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)6); - private static final org.apache.thrift.protocol.TField TABLE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("tableId", org.apache.thrift.protocol.TType.I64, (short)7); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ForeignKeysRequestStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ForeignKeysRequestTupleSchemeFactory(); @@ -27,8 +25,6 @@ private @org.apache.thrift.annotation.Nullable java.lang.String foreign_db_name; // required private @org.apache.thrift.annotation.Nullable java.lang.String foreign_tbl_name; // required private @org.apache.thrift.annotation.Nullable java.lang.String catName; // optional - private @org.apache.thrift.annotation.Nullable java.lang.String validWriteIdList; // optional - private long tableId; // 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 { @@ -36,9 +32,7 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { PARENT_TBL_NAME((short)2, "parent_tbl_name"), FOREIGN_DB_NAME((short)3, "foreign_db_name"), FOREIGN_TBL_NAME((short)4, "foreign_tbl_name"), - CAT_NAME((short)5, "catName"), - VALID_WRITE_ID_LIST((short)6, "validWriteIdList"), - TABLE_ID((short)7, "tableId"); + CAT_NAME((short)5, "catName"); private static final java.util.Map byName = new java.util.HashMap(); @@ -64,10 +58,6 @@ public static _Fields findByThriftId(int fieldId) { return FOREIGN_TBL_NAME; case 5: // CAT_NAME return CAT_NAME; - case 6: // VALID_WRITE_ID_LIST - return VALID_WRITE_ID_LIST; - case 7: // TABLE_ID - return TABLE_ID; default: return null; } @@ -109,9 +99,7 @@ public java.lang.String getFieldName() { } // isset id assignments - private static final int __TABLEID_ISSET_ID = 0; - private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.CAT_NAME,_Fields.VALID_WRITE_ID_LIST,_Fields.TABLE_ID}; + private static final _Fields optionals[] = {_Fields.CAT_NAME}; public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -125,17 +113,11 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); 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.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))); - tmpMap.put(_Fields.TABLE_ID, new org.apache.thrift.meta_data.FieldMetaData("tableId", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ForeignKeysRequest.class, metaDataMap); } public ForeignKeysRequest() { - this.tableId = -1L; - } public ForeignKeysRequest( @@ -155,7 +137,6 @@ public ForeignKeysRequest( * Performs a deep copy on other. */ public ForeignKeysRequest(ForeignKeysRequest other) { - __isset_bitfield = other.__isset_bitfield; if (other.isSetParent_db_name()) { this.parent_db_name = other.parent_db_name; } @@ -171,10 +152,6 @@ public ForeignKeysRequest(ForeignKeysRequest other) { if (other.isSetCatName()) { this.catName = other.catName; } - if (other.isSetValidWriteIdList()) { - this.validWriteIdList = other.validWriteIdList; - } - this.tableId = other.tableId; } public ForeignKeysRequest deepCopy() { @@ -188,9 +165,6 @@ public void clear() { this.foreign_db_name = null; this.foreign_tbl_name = null; this.catName = null; - this.validWriteIdList = null; - this.tableId = -1L; - } @org.apache.thrift.annotation.Nullable @@ -313,52 +287,6 @@ public void setCatNameIsSet(boolean value) { } } - @org.apache.thrift.annotation.Nullable - public java.lang.String getValidWriteIdList() { - return this.validWriteIdList; - } - - public void setValidWriteIdList(@org.apache.thrift.annotation.Nullable java.lang.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 long getTableId() { - return this.tableId; - } - - public void setTableId(long tableId) { - this.tableId = tableId; - setTableIdIsSet(true); - } - - public void unsetTableId() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TABLEID_ISSET_ID); - } - - /** Returns true if field tableId is set (has been assigned a value) and false otherwise */ - public boolean isSetTableId() { - return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TABLEID_ISSET_ID); - } - - public void setTableIdIsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TABLEID_ISSET_ID, value); - } - public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case PARENT_DB_NAME: @@ -401,22 +329,6 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case VALID_WRITE_ID_LIST: - if (value == null) { - unsetValidWriteIdList(); - } else { - setValidWriteIdList((java.lang.String)value); - } - break; - - case TABLE_ID: - if (value == null) { - unsetTableId(); - } else { - setTableId((java.lang.Long)value); - } - break; - } } @@ -438,12 +350,6 @@ public java.lang.Object getFieldValue(_Fields field) { case CAT_NAME: return getCatName(); - case VALID_WRITE_ID_LIST: - return getValidWriteIdList(); - - case TABLE_ID: - return getTableId(); - } throw new java.lang.IllegalStateException(); } @@ -465,10 +371,6 @@ public boolean isSet(_Fields field) { return isSetForeign_tbl_name(); case CAT_NAME: return isSetCatName(); - case VALID_WRITE_ID_LIST: - return isSetValidWriteIdList(); - case TABLE_ID: - return isSetTableId(); } throw new java.lang.IllegalStateException(); } @@ -531,24 +433,6 @@ public boolean equals(ForeignKeysRequest that) { 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; - } - - boolean this_present_tableId = true && this.isSetTableId(); - boolean that_present_tableId = true && that.isSetTableId(); - if (this_present_tableId || that_present_tableId) { - if (!(this_present_tableId && that_present_tableId)) - return false; - if (this.tableId != that.tableId) - return false; - } - return true; } @@ -576,14 +460,6 @@ public int hashCode() { if (isSetCatName()) hashCode = hashCode * 8191 + catName.hashCode(); - hashCode = hashCode * 8191 + ((isSetValidWriteIdList()) ? 131071 : 524287); - if (isSetValidWriteIdList()) - hashCode = hashCode * 8191 + validWriteIdList.hashCode(); - - hashCode = hashCode * 8191 + ((isSetTableId()) ? 131071 : 524287); - if (isSetTableId()) - hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(tableId); - return hashCode; } @@ -645,26 +521,6 @@ public int compareTo(ForeignKeysRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetValidWriteIdList(), other.isSetValidWriteIdList()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetValidWriteIdList()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.validWriteIdList, other.validWriteIdList); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.compare(isSetTableId(), other.isSetTableId()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTableId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableId, other.tableId); - if (lastComparison != 0) { - return lastComparison; - } - } return 0; } @@ -727,22 +583,6 @@ public java.lang.String toString() { } 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; - } - if (isSetTableId()) { - if (!first) sb.append(", "); - sb.append("tableId:"); - sb.append(this.tableId); - first = false; - } sb.append(")"); return sb.toString(); } @@ -762,8 +602,6 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { - // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. - __isset_bitfield = 0; read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); @@ -828,22 +666,6 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, ForeignKeysRequest org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 6: // 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; - case 7: // TABLE_ID - if (schemeField.type == org.apache.thrift.protocol.TType.I64) { - struct.tableId = iprot.readI64(); - struct.setTableIdIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -884,18 +706,6 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ForeignKeysRequest oprot.writeFieldEnd(); } } - if (struct.validWriteIdList != null) { - if (struct.isSetValidWriteIdList()) { - oprot.writeFieldBegin(VALID_WRITE_ID_LIST_FIELD_DESC); - oprot.writeString(struct.validWriteIdList); - oprot.writeFieldEnd(); - } - } - if (struct.isSetTableId()) { - oprot.writeFieldBegin(TABLE_ID_FIELD_DESC); - oprot.writeI64(struct.tableId); - oprot.writeFieldEnd(); - } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -929,13 +739,7 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ForeignKeysRequest if (struct.isSetCatName()) { optionals.set(4); } - if (struct.isSetValidWriteIdList()) { - optionals.set(5); - } - if (struct.isSetTableId()) { - optionals.set(6); - } - oprot.writeBitSet(optionals, 7); + oprot.writeBitSet(optionals, 5); if (struct.isSetParent_db_name()) { oprot.writeString(struct.parent_db_name); } @@ -951,18 +755,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ForeignKeysRequest if (struct.isSetCatName()) { oprot.writeString(struct.catName); } - if (struct.isSetValidWriteIdList()) { - oprot.writeString(struct.validWriteIdList); - } - if (struct.isSetTableId()) { - oprot.writeI64(struct.tableId); - } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, ForeignKeysRequest struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(7); + java.util.BitSet incoming = iprot.readBitSet(5); if (incoming.get(0)) { struct.parent_db_name = iprot.readString(); struct.setParent_db_nameIsSet(true); @@ -983,14 +781,6 @@ public void read(org.apache.thrift.protocol.TProtocol prot, ForeignKeysRequest s struct.catName = iprot.readString(); struct.setCatNameIsSet(true); } - if (incoming.get(5)) { - struct.validWriteIdList = iprot.readString(); - struct.setValidWriteIdListIsSet(true); - } - if (incoming.get(6)) { - struct.tableId = iprot.readI64(); - struct.setTableIdIsSet(true); - } } } diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsRequest.java index 5ca9689e164f..3ce9636e9242 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsRequest.java +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsRequest.java @@ -14,8 +14,6 @@ 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)1); private static final org.apache.thrift.protocol.TField DB_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("db_name", org.apache.thrift.protocol.TType.STRING, (short)2); private static final org.apache.thrift.protocol.TField TBL_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tbl_name", org.apache.thrift.protocol.TType.STRING, (short)3); - 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)4); - private static final org.apache.thrift.protocol.TField TABLE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("tableId", org.apache.thrift.protocol.TType.I64, (short)5); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new NotNullConstraintsRequestStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new NotNullConstraintsRequestTupleSchemeFactory(); @@ -23,16 +21,12 @@ private @org.apache.thrift.annotation.Nullable java.lang.String catName; // required private @org.apache.thrift.annotation.Nullable java.lang.String db_name; // required private @org.apache.thrift.annotation.Nullable java.lang.String tbl_name; // required - private @org.apache.thrift.annotation.Nullable java.lang.String validWriteIdList; // optional - private long tableId; // 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 { CAT_NAME((short)1, "catName"), DB_NAME((short)2, "db_name"), - TBL_NAME((short)3, "tbl_name"), - VALID_WRITE_ID_LIST((short)4, "validWriteIdList"), - TABLE_ID((short)5, "tableId"); + TBL_NAME((short)3, "tbl_name"); private static final java.util.Map byName = new java.util.HashMap(); @@ -54,10 +48,6 @@ public static _Fields findByThriftId(int fieldId) { return DB_NAME; case 3: // TBL_NAME return TBL_NAME; - case 4: // VALID_WRITE_ID_LIST - return VALID_WRITE_ID_LIST; - case 5: // TABLE_ID - return TABLE_ID; default: return null; } @@ -99,9 +89,6 @@ public java.lang.String getFieldName() { } // isset id assignments - private static final int __TABLEID_ISSET_ID = 0; - private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.VALID_WRITE_ID_LIST,_Fields.TABLE_ID}; public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -111,17 +98,11 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.TBL_NAME, new org.apache.thrift.meta_data.FieldMetaData("tbl_name", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - 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))); - tmpMap.put(_Fields.TABLE_ID, new org.apache.thrift.meta_data.FieldMetaData("tableId", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(NotNullConstraintsRequest.class, metaDataMap); } public NotNullConstraintsRequest() { - this.tableId = -1L; - } public NotNullConstraintsRequest( @@ -139,7 +120,6 @@ public NotNullConstraintsRequest( * Performs a deep copy on other. */ public NotNullConstraintsRequest(NotNullConstraintsRequest other) { - __isset_bitfield = other.__isset_bitfield; if (other.isSetCatName()) { this.catName = other.catName; } @@ -149,10 +129,6 @@ public NotNullConstraintsRequest(NotNullConstraintsRequest other) { if (other.isSetTbl_name()) { this.tbl_name = other.tbl_name; } - if (other.isSetValidWriteIdList()) { - this.validWriteIdList = other.validWriteIdList; - } - this.tableId = other.tableId; } public NotNullConstraintsRequest deepCopy() { @@ -164,9 +140,6 @@ public void clear() { this.catName = null; this.db_name = null; this.tbl_name = null; - this.validWriteIdList = null; - this.tableId = -1L; - } @org.apache.thrift.annotation.Nullable @@ -241,52 +214,6 @@ public void setTbl_nameIsSet(boolean value) { } } - @org.apache.thrift.annotation.Nullable - public java.lang.String getValidWriteIdList() { - return this.validWriteIdList; - } - - public void setValidWriteIdList(@org.apache.thrift.annotation.Nullable java.lang.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 long getTableId() { - return this.tableId; - } - - public void setTableId(long tableId) { - this.tableId = tableId; - setTableIdIsSet(true); - } - - public void unsetTableId() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TABLEID_ISSET_ID); - } - - /** Returns true if field tableId is set (has been assigned a value) and false otherwise */ - public boolean isSetTableId() { - return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TABLEID_ISSET_ID); - } - - public void setTableIdIsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TABLEID_ISSET_ID, value); - } - public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case CAT_NAME: @@ -313,22 +240,6 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case VALID_WRITE_ID_LIST: - if (value == null) { - unsetValidWriteIdList(); - } else { - setValidWriteIdList((java.lang.String)value); - } - break; - - case TABLE_ID: - if (value == null) { - unsetTableId(); - } else { - setTableId((java.lang.Long)value); - } - break; - } } @@ -344,12 +255,6 @@ public java.lang.Object getFieldValue(_Fields field) { case TBL_NAME: return getTbl_name(); - case VALID_WRITE_ID_LIST: - return getValidWriteIdList(); - - case TABLE_ID: - return getTableId(); - } throw new java.lang.IllegalStateException(); } @@ -367,10 +272,6 @@ public boolean isSet(_Fields field) { return isSetDb_name(); case TBL_NAME: return isSetTbl_name(); - case VALID_WRITE_ID_LIST: - return isSetValidWriteIdList(); - case TABLE_ID: - return isSetTableId(); } throw new java.lang.IllegalStateException(); } @@ -415,24 +316,6 @@ public boolean equals(NotNullConstraintsRequest that) { 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; - } - - boolean this_present_tableId = true && this.isSetTableId(); - boolean that_present_tableId = true && that.isSetTableId(); - if (this_present_tableId || that_present_tableId) { - if (!(this_present_tableId && that_present_tableId)) - return false; - if (this.tableId != that.tableId) - return false; - } - return true; } @@ -452,14 +335,6 @@ public int hashCode() { if (isSetTbl_name()) hashCode = hashCode * 8191 + tbl_name.hashCode(); - hashCode = hashCode * 8191 + ((isSetValidWriteIdList()) ? 131071 : 524287); - if (isSetValidWriteIdList()) - hashCode = hashCode * 8191 + validWriteIdList.hashCode(); - - hashCode = hashCode * 8191 + ((isSetTableId()) ? 131071 : 524287); - if (isSetTableId()) - hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(tableId); - return hashCode; } @@ -501,26 +376,6 @@ public int compareTo(NotNullConstraintsRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetValidWriteIdList(), other.isSetValidWriteIdList()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetValidWriteIdList()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.validWriteIdList, other.validWriteIdList); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.compare(isSetTableId(), other.isSetTableId()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTableId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableId, other.tableId); - if (lastComparison != 0) { - return lastComparison; - } - } return 0; } @@ -565,22 +420,6 @@ public java.lang.String toString() { sb.append(this.tbl_name); } 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; - } - if (isSetTableId()) { - if (!first) sb.append(", "); - sb.append("tableId:"); - sb.append(this.tableId); - first = false; - } sb.append(")"); return sb.toString(); } @@ -612,8 +451,6 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { - // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. - __isset_bitfield = 0; read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); @@ -662,22 +499,6 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, NotNullConstraintsR org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // 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; - case 5: // TABLE_ID - if (schemeField.type == org.apache.thrift.protocol.TType.I64) { - struct.tableId = iprot.readI64(); - struct.setTableIdIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -706,18 +527,6 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, NotNullConstraints oprot.writeString(struct.tbl_name); oprot.writeFieldEnd(); } - if (struct.validWriteIdList != null) { - if (struct.isSetValidWriteIdList()) { - oprot.writeFieldBegin(VALID_WRITE_ID_LIST_FIELD_DESC); - oprot.writeString(struct.validWriteIdList); - oprot.writeFieldEnd(); - } - } - if (struct.isSetTableId()) { - oprot.writeFieldBegin(TABLE_ID_FIELD_DESC); - oprot.writeI64(struct.tableId); - oprot.writeFieldEnd(); - } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -738,20 +547,6 @@ public void write(org.apache.thrift.protocol.TProtocol prot, NotNullConstraintsR oprot.writeString(struct.catName); oprot.writeString(struct.db_name); oprot.writeString(struct.tbl_name); - java.util.BitSet optionals = new java.util.BitSet(); - if (struct.isSetValidWriteIdList()) { - optionals.set(0); - } - if (struct.isSetTableId()) { - optionals.set(1); - } - oprot.writeBitSet(optionals, 2); - if (struct.isSetValidWriteIdList()) { - oprot.writeString(struct.validWriteIdList); - } - if (struct.isSetTableId()) { - oprot.writeI64(struct.tableId); - } } @Override @@ -763,15 +558,6 @@ public void read(org.apache.thrift.protocol.TProtocol prot, NotNullConstraintsRe struct.setDb_nameIsSet(true); struct.tbl_name = iprot.readString(); struct.setTbl_nameIsSet(true); - java.util.BitSet incoming = iprot.readBitSet(2); - if (incoming.get(0)) { - struct.validWriteIdList = iprot.readString(); - struct.setValidWriteIdListIsSet(true); - } - if (incoming.get(1)) { - struct.tableId = iprot.readI64(); - struct.setTableIdIsSet(true); - } } } diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysRequest.java index 2df2fe1f1d39..156194b98a70 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysRequest.java +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysRequest.java @@ -14,8 +14,6 @@ private static final org.apache.thrift.protocol.TField DB_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("db_name", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField TBL_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tbl_name", org.apache.thrift.protocol.TType.STRING, (short)2); 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)3); - 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)4); - private static final org.apache.thrift.protocol.TField TABLE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("tableId", org.apache.thrift.protocol.TType.I64, (short)5); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new PrimaryKeysRequestStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new PrimaryKeysRequestTupleSchemeFactory(); @@ -23,16 +21,12 @@ private @org.apache.thrift.annotation.Nullable java.lang.String db_name; // required private @org.apache.thrift.annotation.Nullable java.lang.String tbl_name; // required private @org.apache.thrift.annotation.Nullable java.lang.String catName; // optional - private @org.apache.thrift.annotation.Nullable java.lang.String validWriteIdList; // optional - private long tableId; // 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 { DB_NAME((short)1, "db_name"), TBL_NAME((short)2, "tbl_name"), - CAT_NAME((short)3, "catName"), - VALID_WRITE_ID_LIST((short)4, "validWriteIdList"), - TABLE_ID((short)5, "tableId"); + CAT_NAME((short)3, "catName"); private static final java.util.Map byName = new java.util.HashMap(); @@ -54,10 +48,6 @@ public static _Fields findByThriftId(int fieldId) { return TBL_NAME; case 3: // CAT_NAME return CAT_NAME; - case 4: // VALID_WRITE_ID_LIST - return VALID_WRITE_ID_LIST; - case 5: // TABLE_ID - return TABLE_ID; default: return null; } @@ -99,9 +89,7 @@ public java.lang.String getFieldName() { } // isset id assignments - private static final int __TABLEID_ISSET_ID = 0; - private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.CAT_NAME,_Fields.VALID_WRITE_ID_LIST,_Fields.TABLE_ID}; + private static final _Fields optionals[] = {_Fields.CAT_NAME}; public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -111,17 +99,11 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); 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.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))); - tmpMap.put(_Fields.TABLE_ID, new org.apache.thrift.meta_data.FieldMetaData("tableId", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(PrimaryKeysRequest.class, metaDataMap); } public PrimaryKeysRequest() { - this.tableId = -1L; - } public PrimaryKeysRequest( @@ -137,7 +119,6 @@ public PrimaryKeysRequest( * Performs a deep copy on other. */ public PrimaryKeysRequest(PrimaryKeysRequest other) { - __isset_bitfield = other.__isset_bitfield; if (other.isSetDb_name()) { this.db_name = other.db_name; } @@ -147,10 +128,6 @@ public PrimaryKeysRequest(PrimaryKeysRequest other) { if (other.isSetCatName()) { this.catName = other.catName; } - if (other.isSetValidWriteIdList()) { - this.validWriteIdList = other.validWriteIdList; - } - this.tableId = other.tableId; } public PrimaryKeysRequest deepCopy() { @@ -162,9 +139,6 @@ public void clear() { this.db_name = null; this.tbl_name = null; this.catName = null; - this.validWriteIdList = null; - this.tableId = -1L; - } @org.apache.thrift.annotation.Nullable @@ -239,52 +213,6 @@ public void setCatNameIsSet(boolean value) { } } - @org.apache.thrift.annotation.Nullable - public java.lang.String getValidWriteIdList() { - return this.validWriteIdList; - } - - public void setValidWriteIdList(@org.apache.thrift.annotation.Nullable java.lang.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 long getTableId() { - return this.tableId; - } - - public void setTableId(long tableId) { - this.tableId = tableId; - setTableIdIsSet(true); - } - - public void unsetTableId() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TABLEID_ISSET_ID); - } - - /** Returns true if field tableId is set (has been assigned a value) and false otherwise */ - public boolean isSetTableId() { - return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TABLEID_ISSET_ID); - } - - public void setTableIdIsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TABLEID_ISSET_ID, value); - } - public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case DB_NAME: @@ -311,22 +239,6 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case VALID_WRITE_ID_LIST: - if (value == null) { - unsetValidWriteIdList(); - } else { - setValidWriteIdList((java.lang.String)value); - } - break; - - case TABLE_ID: - if (value == null) { - unsetTableId(); - } else { - setTableId((java.lang.Long)value); - } - break; - } } @@ -342,12 +254,6 @@ public java.lang.Object getFieldValue(_Fields field) { case CAT_NAME: return getCatName(); - case VALID_WRITE_ID_LIST: - return getValidWriteIdList(); - - case TABLE_ID: - return getTableId(); - } throw new java.lang.IllegalStateException(); } @@ -365,10 +271,6 @@ public boolean isSet(_Fields field) { return isSetTbl_name(); case CAT_NAME: return isSetCatName(); - case VALID_WRITE_ID_LIST: - return isSetValidWriteIdList(); - case TABLE_ID: - return isSetTableId(); } throw new java.lang.IllegalStateException(); } @@ -413,24 +315,6 @@ public boolean equals(PrimaryKeysRequest that) { 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; - } - - boolean this_present_tableId = true && this.isSetTableId(); - boolean that_present_tableId = true && that.isSetTableId(); - if (this_present_tableId || that_present_tableId) { - if (!(this_present_tableId && that_present_tableId)) - return false; - if (this.tableId != that.tableId) - return false; - } - return true; } @@ -450,14 +334,6 @@ public int hashCode() { if (isSetCatName()) hashCode = hashCode * 8191 + catName.hashCode(); - hashCode = hashCode * 8191 + ((isSetValidWriteIdList()) ? 131071 : 524287); - if (isSetValidWriteIdList()) - hashCode = hashCode * 8191 + validWriteIdList.hashCode(); - - hashCode = hashCode * 8191 + ((isSetTableId()) ? 131071 : 524287); - if (isSetTableId()) - hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(tableId); - return hashCode; } @@ -499,26 +375,6 @@ public int compareTo(PrimaryKeysRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetValidWriteIdList(), other.isSetValidWriteIdList()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetValidWriteIdList()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.validWriteIdList, other.validWriteIdList); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.compare(isSetTableId(), other.isSetTableId()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTableId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableId, other.tableId); - if (lastComparison != 0) { - return lastComparison; - } - } return 0; } @@ -565,22 +421,6 @@ public java.lang.String toString() { } 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; - } - if (isSetTableId()) { - if (!first) sb.append(", "); - sb.append("tableId:"); - sb.append(this.tableId); - first = false; - } sb.append(")"); return sb.toString(); } @@ -608,8 +448,6 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { - // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. - __isset_bitfield = 0; read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); @@ -658,22 +496,6 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, PrimaryKeysRequest org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // 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; - case 5: // TABLE_ID - if (schemeField.type == org.apache.thrift.protocol.TType.I64) { - struct.tableId = iprot.readI64(); - struct.setTableIdIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -704,18 +526,6 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, PrimaryKeysRequest oprot.writeFieldEnd(); } } - if (struct.validWriteIdList != null) { - if (struct.isSetValidWriteIdList()) { - oprot.writeFieldBegin(VALID_WRITE_ID_LIST_FIELD_DESC); - oprot.writeString(struct.validWriteIdList); - oprot.writeFieldEnd(); - } - } - if (struct.isSetTableId()) { - oprot.writeFieldBegin(TABLE_ID_FIELD_DESC); - oprot.writeI64(struct.tableId); - oprot.writeFieldEnd(); - } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -739,22 +549,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, PrimaryKeysRequest if (struct.isSetCatName()) { optionals.set(0); } - if (struct.isSetValidWriteIdList()) { - optionals.set(1); - } - if (struct.isSetTableId()) { - optionals.set(2); - } - oprot.writeBitSet(optionals, 3); + oprot.writeBitSet(optionals, 1); if (struct.isSetCatName()) { oprot.writeString(struct.catName); } - if (struct.isSetValidWriteIdList()) { - oprot.writeString(struct.validWriteIdList); - } - if (struct.isSetTableId()) { - oprot.writeI64(struct.tableId); - } } @Override @@ -764,19 +562,11 @@ public void read(org.apache.thrift.protocol.TProtocol prot, PrimaryKeysRequest s struct.setDb_nameIsSet(true); struct.tbl_name = iprot.readString(); struct.setTbl_nameIsSet(true); - java.util.BitSet incoming = iprot.readBitSet(3); + java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { struct.catName = iprot.readString(); struct.setCatNameIsSet(true); } - if (incoming.get(1)) { - struct.validWriteIdList = iprot.readString(); - struct.setValidWriteIdListIsSet(true); - } - if (incoming.get(2)) { - struct.tableId = iprot.readI64(); - struct.setTableIdIsSet(true); - } } } diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UniqueConstraintsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UniqueConstraintsRequest.java index 3e7852c02bf5..35e8a01d0ee0 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UniqueConstraintsRequest.java +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UniqueConstraintsRequest.java @@ -14,8 +14,6 @@ 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)1); private static final org.apache.thrift.protocol.TField DB_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("db_name", org.apache.thrift.protocol.TType.STRING, (short)2); private static final org.apache.thrift.protocol.TField TBL_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tbl_name", org.apache.thrift.protocol.TType.STRING, (short)3); - 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)4); - private static final org.apache.thrift.protocol.TField TABLE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("tableId", org.apache.thrift.protocol.TType.I64, (short)5); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new UniqueConstraintsRequestStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new UniqueConstraintsRequestTupleSchemeFactory(); @@ -23,16 +21,12 @@ private @org.apache.thrift.annotation.Nullable java.lang.String catName; // required private @org.apache.thrift.annotation.Nullable java.lang.String db_name; // required private @org.apache.thrift.annotation.Nullable java.lang.String tbl_name; // required - private @org.apache.thrift.annotation.Nullable java.lang.String validWriteIdList; // optional - private long tableId; // 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 { CAT_NAME((short)1, "catName"), DB_NAME((short)2, "db_name"), - TBL_NAME((short)3, "tbl_name"), - VALID_WRITE_ID_LIST((short)4, "validWriteIdList"), - TABLE_ID((short)5, "tableId"); + TBL_NAME((short)3, "tbl_name"); private static final java.util.Map byName = new java.util.HashMap(); @@ -54,10 +48,6 @@ public static _Fields findByThriftId(int fieldId) { return DB_NAME; case 3: // TBL_NAME return TBL_NAME; - case 4: // VALID_WRITE_ID_LIST - return VALID_WRITE_ID_LIST; - case 5: // TABLE_ID - return TABLE_ID; default: return null; } @@ -99,9 +89,6 @@ public java.lang.String getFieldName() { } // isset id assignments - private static final int __TABLEID_ISSET_ID = 0; - private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.VALID_WRITE_ID_LIST,_Fields.TABLE_ID}; public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -111,17 +98,11 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.TBL_NAME, new org.apache.thrift.meta_data.FieldMetaData("tbl_name", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - 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))); - tmpMap.put(_Fields.TABLE_ID, new org.apache.thrift.meta_data.FieldMetaData("tableId", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(UniqueConstraintsRequest.class, metaDataMap); } public UniqueConstraintsRequest() { - this.tableId = -1L; - } public UniqueConstraintsRequest( @@ -139,7 +120,6 @@ public UniqueConstraintsRequest( * Performs a deep copy on other. */ public UniqueConstraintsRequest(UniqueConstraintsRequest other) { - __isset_bitfield = other.__isset_bitfield; if (other.isSetCatName()) { this.catName = other.catName; } @@ -149,10 +129,6 @@ public UniqueConstraintsRequest(UniqueConstraintsRequest other) { if (other.isSetTbl_name()) { this.tbl_name = other.tbl_name; } - if (other.isSetValidWriteIdList()) { - this.validWriteIdList = other.validWriteIdList; - } - this.tableId = other.tableId; } public UniqueConstraintsRequest deepCopy() { @@ -164,9 +140,6 @@ public void clear() { this.catName = null; this.db_name = null; this.tbl_name = null; - this.validWriteIdList = null; - this.tableId = -1L; - } @org.apache.thrift.annotation.Nullable @@ -241,52 +214,6 @@ public void setTbl_nameIsSet(boolean value) { } } - @org.apache.thrift.annotation.Nullable - public java.lang.String getValidWriteIdList() { - return this.validWriteIdList; - } - - public void setValidWriteIdList(@org.apache.thrift.annotation.Nullable java.lang.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 long getTableId() { - return this.tableId; - } - - public void setTableId(long tableId) { - this.tableId = tableId; - setTableIdIsSet(true); - } - - public void unsetTableId() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TABLEID_ISSET_ID); - } - - /** Returns true if field tableId is set (has been assigned a value) and false otherwise */ - public boolean isSetTableId() { - return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TABLEID_ISSET_ID); - } - - public void setTableIdIsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TABLEID_ISSET_ID, value); - } - public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case CAT_NAME: @@ -313,22 +240,6 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case VALID_WRITE_ID_LIST: - if (value == null) { - unsetValidWriteIdList(); - } else { - setValidWriteIdList((java.lang.String)value); - } - break; - - case TABLE_ID: - if (value == null) { - unsetTableId(); - } else { - setTableId((java.lang.Long)value); - } - break; - } } @@ -344,12 +255,6 @@ public java.lang.Object getFieldValue(_Fields field) { case TBL_NAME: return getTbl_name(); - case VALID_WRITE_ID_LIST: - return getValidWriteIdList(); - - case TABLE_ID: - return getTableId(); - } throw new java.lang.IllegalStateException(); } @@ -367,10 +272,6 @@ public boolean isSet(_Fields field) { return isSetDb_name(); case TBL_NAME: return isSetTbl_name(); - case VALID_WRITE_ID_LIST: - return isSetValidWriteIdList(); - case TABLE_ID: - return isSetTableId(); } throw new java.lang.IllegalStateException(); } @@ -415,24 +316,6 @@ public boolean equals(UniqueConstraintsRequest that) { 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; - } - - boolean this_present_tableId = true && this.isSetTableId(); - boolean that_present_tableId = true && that.isSetTableId(); - if (this_present_tableId || that_present_tableId) { - if (!(this_present_tableId && that_present_tableId)) - return false; - if (this.tableId != that.tableId) - return false; - } - return true; } @@ -452,14 +335,6 @@ public int hashCode() { if (isSetTbl_name()) hashCode = hashCode * 8191 + tbl_name.hashCode(); - hashCode = hashCode * 8191 + ((isSetValidWriteIdList()) ? 131071 : 524287); - if (isSetValidWriteIdList()) - hashCode = hashCode * 8191 + validWriteIdList.hashCode(); - - hashCode = hashCode * 8191 + ((isSetTableId()) ? 131071 : 524287); - if (isSetTableId()) - hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(tableId); - return hashCode; } @@ -501,26 +376,6 @@ public int compareTo(UniqueConstraintsRequest other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetValidWriteIdList(), other.isSetValidWriteIdList()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetValidWriteIdList()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.validWriteIdList, other.validWriteIdList); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.compare(isSetTableId(), other.isSetTableId()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTableId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableId, other.tableId); - if (lastComparison != 0) { - return lastComparison; - } - } return 0; } @@ -565,22 +420,6 @@ public java.lang.String toString() { sb.append(this.tbl_name); } 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; - } - if (isSetTableId()) { - if (!first) sb.append(", "); - sb.append("tableId:"); - sb.append(this.tableId); - first = false; - } sb.append(")"); return sb.toString(); } @@ -612,8 +451,6 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { - // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. - __isset_bitfield = 0; read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); @@ -662,22 +499,6 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, UniqueConstraintsRe org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // 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; - case 5: // TABLE_ID - if (schemeField.type == org.apache.thrift.protocol.TType.I64) { - struct.tableId = iprot.readI64(); - struct.setTableIdIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -706,18 +527,6 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, UniqueConstraintsR oprot.writeString(struct.tbl_name); oprot.writeFieldEnd(); } - if (struct.validWriteIdList != null) { - if (struct.isSetValidWriteIdList()) { - oprot.writeFieldBegin(VALID_WRITE_ID_LIST_FIELD_DESC); - oprot.writeString(struct.validWriteIdList); - oprot.writeFieldEnd(); - } - } - if (struct.isSetTableId()) { - oprot.writeFieldBegin(TABLE_ID_FIELD_DESC); - oprot.writeI64(struct.tableId); - oprot.writeFieldEnd(); - } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -738,20 +547,6 @@ public void write(org.apache.thrift.protocol.TProtocol prot, UniqueConstraintsRe oprot.writeString(struct.catName); oprot.writeString(struct.db_name); oprot.writeString(struct.tbl_name); - java.util.BitSet optionals = new java.util.BitSet(); - if (struct.isSetValidWriteIdList()) { - optionals.set(0); - } - if (struct.isSetTableId()) { - optionals.set(1); - } - oprot.writeBitSet(optionals, 2); - if (struct.isSetValidWriteIdList()) { - oprot.writeString(struct.validWriteIdList); - } - if (struct.isSetTableId()) { - oprot.writeI64(struct.tableId); - } } @Override @@ -763,15 +558,6 @@ public void read(org.apache.thrift.protocol.TProtocol prot, UniqueConstraintsReq struct.setDb_nameIsSet(true); struct.tbl_name = iprot.readString(); struct.setTbl_nameIsSet(true); - java.util.BitSet incoming = iprot.readBitSet(2); - if (incoming.get(0)) { - struct.validWriteIdList = iprot.readString(); - struct.setValidWriteIdListIsSet(true); - } - if (incoming.get(1)) { - struct.tableId = iprot.readI64(); - struct.setTableIdIsSet(true); - } } } diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AllTableConstraintsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AllTableConstraintsRequest.php index 653f6a12f3ed..4db095dfa259 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AllTableConstraintsRequest.php +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/AllTableConstraintsRequest.php @@ -36,16 +36,6 @@ class AllTableConstraintsRequest 'isRequired' => true, 'type' => TType::STRING, ), - 4 => array( - 'var' => 'validWriteIdList', - 'isRequired' => false, - 'type' => TType::STRING, - ), - 5 => array( - 'var' => 'tableId', - 'isRequired' => false, - 'type' => TType::I64, - ), ); /** @@ -60,14 +50,6 @@ class AllTableConstraintsRequest * @var string */ public $catName = null; - /** - * @var string - */ - public $validWriteIdList = null; - /** - * @var int - */ - public $tableId = -1; public function __construct($vals = null) { @@ -81,12 +63,6 @@ public function __construct($vals = null) if (isset($vals['catName'])) { $this->catName = $vals['catName']; } - if (isset($vals['validWriteIdList'])) { - $this->validWriteIdList = $vals['validWriteIdList']; - } - if (isset($vals['tableId'])) { - $this->tableId = $vals['tableId']; - } } } @@ -130,20 +106,6 @@ public function read($input) $xfer += $input->skip($ftype); } break; - case 4: - if ($ftype == TType::STRING) { - $xfer += $input->readString($this->validWriteIdList); - } else { - $xfer += $input->skip($ftype); - } - break; - case 5: - if ($ftype == TType::I64) { - $xfer += $input->readI64($this->tableId); - } else { - $xfer += $input->skip($ftype); - } - break; default: $xfer += $input->skip($ftype); break; @@ -173,16 +135,6 @@ public function write($output) $xfer += $output->writeString($this->catName); $xfer += $output->writeFieldEnd(); } - if ($this->validWriteIdList !== null) { - $xfer += $output->writeFieldBegin('validWriteIdList', TType::STRING, 4); - $xfer += $output->writeString($this->validWriteIdList); - $xfer += $output->writeFieldEnd(); - } - if ($this->tableId !== null) { - $xfer += $output->writeFieldBegin('tableId', TType::I64, 5); - $xfer += $output->writeI64($this->tableId); - $xfer += $output->writeFieldEnd(); - } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CheckConstraintsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CheckConstraintsRequest.php index a6327705f016..84c0f42de747 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CheckConstraintsRequest.php +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/CheckConstraintsRequest.php @@ -36,16 +36,6 @@ class CheckConstraintsRequest 'isRequired' => true, 'type' => TType::STRING, ), - 4 => array( - 'var' => 'validWriteIdList', - 'isRequired' => false, - 'type' => TType::STRING, - ), - 5 => array( - 'var' => 'tableId', - 'isRequired' => false, - 'type' => TType::I64, - ), ); /** @@ -60,14 +50,6 @@ class CheckConstraintsRequest * @var string */ public $tbl_name = null; - /** - * @var string - */ - public $validWriteIdList = null; - /** - * @var int - */ - public $tableId = -1; public function __construct($vals = null) { @@ -81,12 +63,6 @@ public function __construct($vals = null) if (isset($vals['tbl_name'])) { $this->tbl_name = $vals['tbl_name']; } - if (isset($vals['validWriteIdList'])) { - $this->validWriteIdList = $vals['validWriteIdList']; - } - if (isset($vals['tableId'])) { - $this->tableId = $vals['tableId']; - } } } @@ -130,20 +106,6 @@ public function read($input) $xfer += $input->skip($ftype); } break; - case 4: - if ($ftype == TType::STRING) { - $xfer += $input->readString($this->validWriteIdList); - } else { - $xfer += $input->skip($ftype); - } - break; - case 5: - if ($ftype == TType::I64) { - $xfer += $input->readI64($this->tableId); - } else { - $xfer += $input->skip($ftype); - } - break; default: $xfer += $input->skip($ftype); break; @@ -173,16 +135,6 @@ public function write($output) $xfer += $output->writeString($this->tbl_name); $xfer += $output->writeFieldEnd(); } - if ($this->validWriteIdList !== null) { - $xfer += $output->writeFieldBegin('validWriteIdList', TType::STRING, 4); - $xfer += $output->writeString($this->validWriteIdList); - $xfer += $output->writeFieldEnd(); - } - if ($this->tableId !== null) { - $xfer += $output->writeFieldBegin('tableId', TType::I64, 5); - $xfer += $output->writeI64($this->tableId); - $xfer += $output->writeFieldEnd(); - } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DefaultConstraintsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DefaultConstraintsRequest.php index 6506c00c2197..6955eb8b8ec8 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DefaultConstraintsRequest.php +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/DefaultConstraintsRequest.php @@ -36,16 +36,6 @@ class DefaultConstraintsRequest 'isRequired' => true, 'type' => TType::STRING, ), - 4 => array( - 'var' => 'validWriteIdList', - 'isRequired' => false, - 'type' => TType::STRING, - ), - 5 => array( - 'var' => 'tableId', - 'isRequired' => false, - 'type' => TType::I64, - ), ); /** @@ -60,14 +50,6 @@ class DefaultConstraintsRequest * @var string */ public $tbl_name = null; - /** - * @var string - */ - public $validWriteIdList = null; - /** - * @var int - */ - public $tableId = -1; public function __construct($vals = null) { @@ -81,12 +63,6 @@ public function __construct($vals = null) if (isset($vals['tbl_name'])) { $this->tbl_name = $vals['tbl_name']; } - if (isset($vals['validWriteIdList'])) { - $this->validWriteIdList = $vals['validWriteIdList']; - } - if (isset($vals['tableId'])) { - $this->tableId = $vals['tableId']; - } } } @@ -130,20 +106,6 @@ public function read($input) $xfer += $input->skip($ftype); } break; - case 4: - if ($ftype == TType::STRING) { - $xfer += $input->readString($this->validWriteIdList); - } else { - $xfer += $input->skip($ftype); - } - break; - case 5: - if ($ftype == TType::I64) { - $xfer += $input->readI64($this->tableId); - } else { - $xfer += $input->skip($ftype); - } - break; default: $xfer += $input->skip($ftype); break; @@ -173,16 +135,6 @@ public function write($output) $xfer += $output->writeString($this->tbl_name); $xfer += $output->writeFieldEnd(); } - if ($this->validWriteIdList !== null) { - $xfer += $output->writeFieldBegin('validWriteIdList', TType::STRING, 4); - $xfer += $output->writeString($this->validWriteIdList); - $xfer += $output->writeFieldEnd(); - } - if ($this->tableId !== null) { - $xfer += $output->writeFieldBegin('tableId', TType::I64, 5); - $xfer += $output->writeI64($this->tableId); - $xfer += $output->writeFieldEnd(); - } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ForeignKeysRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ForeignKeysRequest.php index 7fa2a646c260..f0c7b85f4cdf 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ForeignKeysRequest.php +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ForeignKeysRequest.php @@ -46,16 +46,6 @@ class ForeignKeysRequest 'isRequired' => false, 'type' => TType::STRING, ), - 6 => array( - 'var' => 'validWriteIdList', - 'isRequired' => false, - 'type' => TType::STRING, - ), - 7 => array( - 'var' => 'tableId', - 'isRequired' => false, - 'type' => TType::I64, - ), ); /** @@ -78,14 +68,6 @@ class ForeignKeysRequest * @var string */ public $catName = null; - /** - * @var string - */ - public $validWriteIdList = null; - /** - * @var int - */ - public $tableId = -1; public function __construct($vals = null) { @@ -105,12 +87,6 @@ public function __construct($vals = null) if (isset($vals['catName'])) { $this->catName = $vals['catName']; } - if (isset($vals['validWriteIdList'])) { - $this->validWriteIdList = $vals['validWriteIdList']; - } - if (isset($vals['tableId'])) { - $this->tableId = $vals['tableId']; - } } } @@ -168,20 +144,6 @@ public function read($input) $xfer += $input->skip($ftype); } break; - case 6: - if ($ftype == TType::STRING) { - $xfer += $input->readString($this->validWriteIdList); - } else { - $xfer += $input->skip($ftype); - } - break; - case 7: - if ($ftype == TType::I64) { - $xfer += $input->readI64($this->tableId); - } else { - $xfer += $input->skip($ftype); - } - break; default: $xfer += $input->skip($ftype); break; @@ -221,16 +183,6 @@ public function write($output) $xfer += $output->writeString($this->catName); $xfer += $output->writeFieldEnd(); } - if ($this->validWriteIdList !== null) { - $xfer += $output->writeFieldBegin('validWriteIdList', TType::STRING, 6); - $xfer += $output->writeString($this->validWriteIdList); - $xfer += $output->writeFieldEnd(); - } - if ($this->tableId !== null) { - $xfer += $output->writeFieldBegin('tableId', TType::I64, 7); - $xfer += $output->writeI64($this->tableId); - $xfer += $output->writeFieldEnd(); - } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotNullConstraintsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotNullConstraintsRequest.php index 86c7f918b97a..2360bdf297b5 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotNullConstraintsRequest.php +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/NotNullConstraintsRequest.php @@ -36,16 +36,6 @@ class NotNullConstraintsRequest 'isRequired' => true, 'type' => TType::STRING, ), - 4 => array( - 'var' => 'validWriteIdList', - 'isRequired' => false, - 'type' => TType::STRING, - ), - 5 => array( - 'var' => 'tableId', - 'isRequired' => false, - 'type' => TType::I64, - ), ); /** @@ -60,14 +50,6 @@ class NotNullConstraintsRequest * @var string */ public $tbl_name = null; - /** - * @var string - */ - public $validWriteIdList = null; - /** - * @var int - */ - public $tableId = -1; public function __construct($vals = null) { @@ -81,12 +63,6 @@ public function __construct($vals = null) if (isset($vals['tbl_name'])) { $this->tbl_name = $vals['tbl_name']; } - if (isset($vals['validWriteIdList'])) { - $this->validWriteIdList = $vals['validWriteIdList']; - } - if (isset($vals['tableId'])) { - $this->tableId = $vals['tableId']; - } } } @@ -130,20 +106,6 @@ public function read($input) $xfer += $input->skip($ftype); } break; - case 4: - if ($ftype == TType::STRING) { - $xfer += $input->readString($this->validWriteIdList); - } else { - $xfer += $input->skip($ftype); - } - break; - case 5: - if ($ftype == TType::I64) { - $xfer += $input->readI64($this->tableId); - } else { - $xfer += $input->skip($ftype); - } - break; default: $xfer += $input->skip($ftype); break; @@ -173,16 +135,6 @@ public function write($output) $xfer += $output->writeString($this->tbl_name); $xfer += $output->writeFieldEnd(); } - if ($this->validWriteIdList !== null) { - $xfer += $output->writeFieldBegin('validWriteIdList', TType::STRING, 4); - $xfer += $output->writeString($this->validWriteIdList); - $xfer += $output->writeFieldEnd(); - } - if ($this->tableId !== null) { - $xfer += $output->writeFieldBegin('tableId', TType::I64, 5); - $xfer += $output->writeI64($this->tableId); - $xfer += $output->writeFieldEnd(); - } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PrimaryKeysRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PrimaryKeysRequest.php index 95d523619c9b..b6e478a34afa 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PrimaryKeysRequest.php +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/PrimaryKeysRequest.php @@ -36,16 +36,6 @@ class PrimaryKeysRequest 'isRequired' => false, 'type' => TType::STRING, ), - 4 => array( - 'var' => 'validWriteIdList', - 'isRequired' => false, - 'type' => TType::STRING, - ), - 5 => array( - 'var' => 'tableId', - 'isRequired' => false, - 'type' => TType::I64, - ), ); /** @@ -60,14 +50,6 @@ class PrimaryKeysRequest * @var string */ public $catName = null; - /** - * @var string - */ - public $validWriteIdList = null; - /** - * @var int - */ - public $tableId = -1; public function __construct($vals = null) { @@ -81,12 +63,6 @@ public function __construct($vals = null) if (isset($vals['catName'])) { $this->catName = $vals['catName']; } - if (isset($vals['validWriteIdList'])) { - $this->validWriteIdList = $vals['validWriteIdList']; - } - if (isset($vals['tableId'])) { - $this->tableId = $vals['tableId']; - } } } @@ -130,20 +106,6 @@ public function read($input) $xfer += $input->skip($ftype); } break; - case 4: - if ($ftype == TType::STRING) { - $xfer += $input->readString($this->validWriteIdList); - } else { - $xfer += $input->skip($ftype); - } - break; - case 5: - if ($ftype == TType::I64) { - $xfer += $input->readI64($this->tableId); - } else { - $xfer += $input->skip($ftype); - } - break; default: $xfer += $input->skip($ftype); break; @@ -173,16 +135,6 @@ public function write($output) $xfer += $output->writeString($this->catName); $xfer += $output->writeFieldEnd(); } - if ($this->validWriteIdList !== null) { - $xfer += $output->writeFieldBegin('validWriteIdList', TType::STRING, 4); - $xfer += $output->writeString($this->validWriteIdList); - $xfer += $output->writeFieldEnd(); - } - if ($this->tableId !== null) { - $xfer += $output->writeFieldBegin('tableId', TType::I64, 5); - $xfer += $output->writeI64($this->tableId); - $xfer += $output->writeFieldEnd(); - } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UniqueConstraintsRequest.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UniqueConstraintsRequest.php index f69da998d690..d6aa90f3a637 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UniqueConstraintsRequest.php +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/UniqueConstraintsRequest.php @@ -36,16 +36,6 @@ class UniqueConstraintsRequest 'isRequired' => true, 'type' => TType::STRING, ), - 4 => array( - 'var' => 'validWriteIdList', - 'isRequired' => false, - 'type' => TType::STRING, - ), - 5 => array( - 'var' => 'tableId', - 'isRequired' => false, - 'type' => TType::I64, - ), ); /** @@ -60,14 +50,6 @@ class UniqueConstraintsRequest * @var string */ public $tbl_name = null; - /** - * @var string - */ - public $validWriteIdList = null; - /** - * @var int - */ - public $tableId = -1; public function __construct($vals = null) { @@ -81,12 +63,6 @@ public function __construct($vals = null) if (isset($vals['tbl_name'])) { $this->tbl_name = $vals['tbl_name']; } - if (isset($vals['validWriteIdList'])) { - $this->validWriteIdList = $vals['validWriteIdList']; - } - if (isset($vals['tableId'])) { - $this->tableId = $vals['tableId']; - } } } @@ -130,20 +106,6 @@ public function read($input) $xfer += $input->skip($ftype); } break; - case 4: - if ($ftype == TType::STRING) { - $xfer += $input->readString($this->validWriteIdList); - } else { - $xfer += $input->skip($ftype); - } - break; - case 5: - if ($ftype == TType::I64) { - $xfer += $input->readI64($this->tableId); - } else { - $xfer += $input->skip($ftype); - } - break; default: $xfer += $input->skip($ftype); break; @@ -173,16 +135,6 @@ public function write($output) $xfer += $output->writeString($this->tbl_name); $xfer += $output->writeFieldEnd(); } - if ($this->validWriteIdList !== null) { - $xfer += $output->writeFieldBegin('validWriteIdList', TType::STRING, 4); - $xfer += $output->writeString($this->validWriteIdList); - $xfer += $output->writeFieldEnd(); - } - if ($this->tableId !== null) { - $xfer += $output->writeFieldBegin('tableId', TType::I64, 5); - $xfer += $output->writeI64($this->tableId); - $xfer += $output->writeFieldEnd(); - } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ttypes.py b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ttypes.py index cbb271a05562..508d4d1e020b 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ttypes.py +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ttypes.py @@ -8378,18 +8378,14 @@ class PrimaryKeysRequest(object): - db_name - tbl_name - catName - - validWriteIdList - - tableId """ - def __init__(self, db_name=None, tbl_name=None, catName=None, validWriteIdList=None, tableId=-1,): + def __init__(self, db_name=None, tbl_name=None, catName=None,): self.db_name = db_name self.tbl_name = tbl_name self.catName = catName - self.validWriteIdList = validWriteIdList - self.tableId = tableId def read(self, iprot): if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: @@ -8415,16 +8411,6 @@ def read(self, iprot): self.catName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) - elif fid == 4: - if ftype == TType.STRING: - self.validWriteIdList = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() - else: - iprot.skip(ftype) - elif fid == 5: - if ftype == TType.I64: - self.tableId = iprot.readI64() - else: - iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -8447,14 +8433,6 @@ def write(self, oprot): oprot.writeFieldBegin('catName', TType.STRING, 3) oprot.writeString(self.catName.encode('utf-8') if sys.version_info[0] == 2 else self.catName) oprot.writeFieldEnd() - if self.validWriteIdList is not None: - oprot.writeFieldBegin('validWriteIdList', TType.STRING, 4) - oprot.writeString(self.validWriteIdList.encode('utf-8') if sys.version_info[0] == 2 else self.validWriteIdList) - oprot.writeFieldEnd() - if self.tableId is not None: - oprot.writeFieldBegin('tableId', TType.I64, 5) - oprot.writeI64(self.tableId) - oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -8553,20 +8531,16 @@ class ForeignKeysRequest(object): - foreign_db_name - foreign_tbl_name - catName - - validWriteIdList - - tableId """ - def __init__(self, parent_db_name=None, parent_tbl_name=None, foreign_db_name=None, foreign_tbl_name=None, catName=None, validWriteIdList=None, tableId=-1,): + def __init__(self, parent_db_name=None, parent_tbl_name=None, foreign_db_name=None, foreign_tbl_name=None, catName=None,): self.parent_db_name = parent_db_name self.parent_tbl_name = parent_tbl_name self.foreign_db_name = foreign_db_name self.foreign_tbl_name = foreign_tbl_name self.catName = catName - self.validWriteIdList = validWriteIdList - self.tableId = tableId def read(self, iprot): if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: @@ -8602,16 +8576,6 @@ def read(self, iprot): self.catName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) - elif fid == 6: - if ftype == TType.STRING: - self.validWriteIdList = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() - else: - iprot.skip(ftype) - elif fid == 7: - if ftype == TType.I64: - self.tableId = iprot.readI64() - else: - iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -8642,14 +8606,6 @@ def write(self, oprot): oprot.writeFieldBegin('catName', TType.STRING, 5) oprot.writeString(self.catName.encode('utf-8') if sys.version_info[0] == 2 else self.catName) oprot.writeFieldEnd() - if self.validWriteIdList is not None: - oprot.writeFieldBegin('validWriteIdList', TType.STRING, 6) - oprot.writeString(self.validWriteIdList.encode('utf-8') if sys.version_info[0] == 2 else self.validWriteIdList) - oprot.writeFieldEnd() - if self.tableId is not None: - oprot.writeFieldBegin('tableId', TType.I64, 7) - oprot.writeI64(self.tableId) - oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -8742,18 +8698,14 @@ class UniqueConstraintsRequest(object): - catName - db_name - tbl_name - - validWriteIdList - - tableId """ - def __init__(self, catName=None, db_name=None, tbl_name=None, validWriteIdList=None, tableId=-1,): + def __init__(self, catName=None, db_name=None, tbl_name=None,): self.catName = catName self.db_name = db_name self.tbl_name = tbl_name - self.validWriteIdList = validWriteIdList - self.tableId = tableId def read(self, iprot): if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: @@ -8779,16 +8731,6 @@ def read(self, iprot): self.tbl_name = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) - elif fid == 4: - if ftype == TType.STRING: - self.validWriteIdList = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() - else: - iprot.skip(ftype) - elif fid == 5: - if ftype == TType.I64: - self.tableId = iprot.readI64() - else: - iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -8811,14 +8753,6 @@ def write(self, oprot): oprot.writeFieldBegin('tbl_name', TType.STRING, 3) oprot.writeString(self.tbl_name.encode('utf-8') if sys.version_info[0] == 2 else self.tbl_name) oprot.writeFieldEnd() - if self.validWriteIdList is not None: - oprot.writeFieldBegin('validWriteIdList', TType.STRING, 4) - oprot.writeString(self.validWriteIdList.encode('utf-8') if sys.version_info[0] == 2 else self.validWriteIdList) - oprot.writeFieldEnd() - if self.tableId is not None: - oprot.writeFieldBegin('tableId', TType.I64, 5) - oprot.writeI64(self.tableId) - oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -8917,18 +8851,14 @@ class NotNullConstraintsRequest(object): - catName - db_name - tbl_name - - validWriteIdList - - tableId """ - def __init__(self, catName=None, db_name=None, tbl_name=None, validWriteIdList=None, tableId=-1,): + def __init__(self, catName=None, db_name=None, tbl_name=None,): self.catName = catName self.db_name = db_name self.tbl_name = tbl_name - self.validWriteIdList = validWriteIdList - self.tableId = tableId def read(self, iprot): if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: @@ -8954,16 +8884,6 @@ def read(self, iprot): self.tbl_name = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) - elif fid == 4: - if ftype == TType.STRING: - self.validWriteIdList = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() - else: - iprot.skip(ftype) - elif fid == 5: - if ftype == TType.I64: - self.tableId = iprot.readI64() - else: - iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -8986,14 +8906,6 @@ def write(self, oprot): oprot.writeFieldBegin('tbl_name', TType.STRING, 3) oprot.writeString(self.tbl_name.encode('utf-8') if sys.version_info[0] == 2 else self.tbl_name) oprot.writeFieldEnd() - if self.validWriteIdList is not None: - oprot.writeFieldBegin('validWriteIdList', TType.STRING, 4) - oprot.writeString(self.validWriteIdList.encode('utf-8') if sys.version_info[0] == 2 else self.validWriteIdList) - oprot.writeFieldEnd() - if self.tableId is not None: - oprot.writeFieldBegin('tableId', TType.I64, 5) - oprot.writeI64(self.tableId) - oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -9092,18 +9004,14 @@ class DefaultConstraintsRequest(object): - catName - db_name - tbl_name - - validWriteIdList - - tableId """ - def __init__(self, catName=None, db_name=None, tbl_name=None, validWriteIdList=None, tableId=-1,): + def __init__(self, catName=None, db_name=None, tbl_name=None,): self.catName = catName self.db_name = db_name self.tbl_name = tbl_name - self.validWriteIdList = validWriteIdList - self.tableId = tableId def read(self, iprot): if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: @@ -9129,16 +9037,6 @@ def read(self, iprot): self.tbl_name = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) - elif fid == 4: - if ftype == TType.STRING: - self.validWriteIdList = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() - else: - iprot.skip(ftype) - elif fid == 5: - if ftype == TType.I64: - self.tableId = iprot.readI64() - else: - iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -9161,14 +9059,6 @@ def write(self, oprot): oprot.writeFieldBegin('tbl_name', TType.STRING, 3) oprot.writeString(self.tbl_name.encode('utf-8') if sys.version_info[0] == 2 else self.tbl_name) oprot.writeFieldEnd() - if self.validWriteIdList is not None: - oprot.writeFieldBegin('validWriteIdList', TType.STRING, 4) - oprot.writeString(self.validWriteIdList.encode('utf-8') if sys.version_info[0] == 2 else self.validWriteIdList) - oprot.writeFieldEnd() - if self.tableId is not None: - oprot.writeFieldBegin('tableId', TType.I64, 5) - oprot.writeI64(self.tableId) - oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -9267,18 +9157,14 @@ class CheckConstraintsRequest(object): - catName - db_name - tbl_name - - validWriteIdList - - tableId """ - def __init__(self, catName=None, db_name=None, tbl_name=None, validWriteIdList=None, tableId=-1,): + def __init__(self, catName=None, db_name=None, tbl_name=None,): self.catName = catName self.db_name = db_name self.tbl_name = tbl_name - self.validWriteIdList = validWriteIdList - self.tableId = tableId def read(self, iprot): if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: @@ -9304,16 +9190,6 @@ def read(self, iprot): self.tbl_name = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) - elif fid == 4: - if ftype == TType.STRING: - self.validWriteIdList = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() - else: - iprot.skip(ftype) - elif fid == 5: - if ftype == TType.I64: - self.tableId = iprot.readI64() - else: - iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -9336,14 +9212,6 @@ def write(self, oprot): oprot.writeFieldBegin('tbl_name', TType.STRING, 3) oprot.writeString(self.tbl_name.encode('utf-8') if sys.version_info[0] == 2 else self.tbl_name) oprot.writeFieldEnd() - if self.validWriteIdList is not None: - oprot.writeFieldBegin('validWriteIdList', TType.STRING, 4) - oprot.writeString(self.validWriteIdList.encode('utf-8') if sys.version_info[0] == 2 else self.validWriteIdList) - oprot.writeFieldEnd() - if self.tableId is not None: - oprot.writeFieldBegin('tableId', TType.I64, 5) - oprot.writeI64(self.tableId) - oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -9442,18 +9310,14 @@ class AllTableConstraintsRequest(object): - dbName - tblName - catName - - validWriteIdList - - tableId """ - def __init__(self, dbName=None, tblName=None, catName=None, validWriteIdList=None, tableId=-1,): + def __init__(self, dbName=None, tblName=None, catName=None,): self.dbName = dbName self.tblName = tblName self.catName = catName - self.validWriteIdList = validWriteIdList - self.tableId = tableId def read(self, iprot): if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: @@ -9479,16 +9343,6 @@ def read(self, iprot): self.catName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) - elif fid == 4: - if ftype == TType.STRING: - self.validWriteIdList = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() - else: - iprot.skip(ftype) - elif fid == 5: - if ftype == TType.I64: - self.tableId = iprot.readI64() - else: - iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -9511,14 +9365,6 @@ def write(self, oprot): oprot.writeFieldBegin('catName', TType.STRING, 3) oprot.writeString(self.catName.encode('utf-8') if sys.version_info[0] == 2 else self.catName) oprot.writeFieldEnd() - if self.validWriteIdList is not None: - oprot.writeFieldBegin('validWriteIdList', TType.STRING, 4) - oprot.writeString(self.validWriteIdList.encode('utf-8') if sys.version_info[0] == 2 else self.validWriteIdList) - oprot.writeFieldEnd() - if self.tableId is not None: - oprot.writeFieldBegin('tableId', TType.I64, 5) - oprot.writeI64(self.tableId) - oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -33105,8 +32951,6 @@ def __ne__(self, other): (1, TType.STRING, 'db_name', 'UTF8', None, ), # 1 (2, TType.STRING, 'tbl_name', 'UTF8', None, ), # 2 (3, TType.STRING, 'catName', 'UTF8', None, ), # 3 - (4, TType.STRING, 'validWriteIdList', 'UTF8', None, ), # 4 - (5, TType.I64, 'tableId', None, -1, ), # 5 ) all_structs.append(PrimaryKeysResponse) PrimaryKeysResponse.thrift_spec = ( @@ -33121,8 +32965,6 @@ def __ne__(self, other): (3, TType.STRING, 'foreign_db_name', 'UTF8', None, ), # 3 (4, TType.STRING, 'foreign_tbl_name', 'UTF8', None, ), # 4 (5, TType.STRING, 'catName', 'UTF8', None, ), # 5 - (6, TType.STRING, 'validWriteIdList', 'UTF8', None, ), # 6 - (7, TType.I64, 'tableId', None, -1, ), # 7 ) all_structs.append(ForeignKeysResponse) ForeignKeysResponse.thrift_spec = ( @@ -33135,8 +32977,6 @@ def __ne__(self, other): (1, TType.STRING, 'catName', 'UTF8', None, ), # 1 (2, TType.STRING, 'db_name', 'UTF8', None, ), # 2 (3, TType.STRING, 'tbl_name', 'UTF8', None, ), # 3 - (4, TType.STRING, 'validWriteIdList', 'UTF8', None, ), # 4 - (5, TType.I64, 'tableId', None, -1, ), # 5 ) all_structs.append(UniqueConstraintsResponse) UniqueConstraintsResponse.thrift_spec = ( @@ -33149,8 +32989,6 @@ def __ne__(self, other): (1, TType.STRING, 'catName', 'UTF8', None, ), # 1 (2, TType.STRING, 'db_name', 'UTF8', None, ), # 2 (3, TType.STRING, 'tbl_name', 'UTF8', None, ), # 3 - (4, TType.STRING, 'validWriteIdList', 'UTF8', None, ), # 4 - (5, TType.I64, 'tableId', None, -1, ), # 5 ) all_structs.append(NotNullConstraintsResponse) NotNullConstraintsResponse.thrift_spec = ( @@ -33163,8 +33001,6 @@ def __ne__(self, other): (1, TType.STRING, 'catName', 'UTF8', None, ), # 1 (2, TType.STRING, 'db_name', 'UTF8', None, ), # 2 (3, TType.STRING, 'tbl_name', 'UTF8', None, ), # 3 - (4, TType.STRING, 'validWriteIdList', 'UTF8', None, ), # 4 - (5, TType.I64, 'tableId', None, -1, ), # 5 ) all_structs.append(DefaultConstraintsResponse) DefaultConstraintsResponse.thrift_spec = ( @@ -33177,8 +33013,6 @@ def __ne__(self, other): (1, TType.STRING, 'catName', 'UTF8', None, ), # 1 (2, TType.STRING, 'db_name', 'UTF8', None, ), # 2 (3, TType.STRING, 'tbl_name', 'UTF8', None, ), # 3 - (4, TType.STRING, 'validWriteIdList', 'UTF8', None, ), # 4 - (5, TType.I64, 'tableId', None, -1, ), # 5 ) all_structs.append(CheckConstraintsResponse) CheckConstraintsResponse.thrift_spec = ( @@ -33191,8 +33025,6 @@ def __ne__(self, other): (1, TType.STRING, 'dbName', 'UTF8', None, ), # 1 (2, TType.STRING, 'tblName', 'UTF8', None, ), # 2 (3, TType.STRING, 'catName', 'UTF8', None, ), # 3 - (4, TType.STRING, 'validWriteIdList', 'UTF8', None, ), # 4 - (5, TType.I64, 'tableId', None, -1, ), # 5 ) all_structs.append(AllTableConstraintsResponse) AllTableConstraintsResponse.thrift_spec = ( diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/hive_metastore_types.rb b/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/hive_metastore_types.rb index 5ef543dd235c..a5a13fa96bd5 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/hive_metastore_types.rb +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/hive_metastore_types.rb @@ -2772,15 +2772,11 @@ class PrimaryKeysRequest DB_NAME = 1 TBL_NAME = 2 CATNAME = 3 - VALIDWRITEIDLIST = 4 - TABLEID = 5 FIELDS = { DB_NAME => {:type => ::Thrift::Types::STRING, :name => 'db_name'}, TBL_NAME => {:type => ::Thrift::Types::STRING, :name => 'tbl_name'}, - CATNAME => {:type => ::Thrift::Types::STRING, :name => 'catName', :optional => true}, - VALIDWRITEIDLIST => {:type => ::Thrift::Types::STRING, :name => 'validWriteIdList', :optional => true}, - TABLEID => {:type => ::Thrift::Types::I64, :name => 'tableId', :default => -1, :optional => true} + CATNAME => {:type => ::Thrift::Types::STRING, :name => 'catName', :optional => true} } def struct_fields; FIELDS; end @@ -2817,17 +2813,13 @@ class ForeignKeysRequest FOREIGN_DB_NAME = 3 FOREIGN_TBL_NAME = 4 CATNAME = 5 - VALIDWRITEIDLIST = 6 - TABLEID = 7 FIELDS = { PARENT_DB_NAME => {:type => ::Thrift::Types::STRING, :name => 'parent_db_name'}, PARENT_TBL_NAME => {:type => ::Thrift::Types::STRING, :name => 'parent_tbl_name'}, FOREIGN_DB_NAME => {:type => ::Thrift::Types::STRING, :name => 'foreign_db_name'}, FOREIGN_TBL_NAME => {:type => ::Thrift::Types::STRING, :name => 'foreign_tbl_name'}, - CATNAME => {:type => ::Thrift::Types::STRING, :name => 'catName', :optional => true}, - VALIDWRITEIDLIST => {:type => ::Thrift::Types::STRING, :name => 'validWriteIdList', :optional => true}, - TABLEID => {:type => ::Thrift::Types::I64, :name => 'tableId', :default => -1, :optional => true} + CATNAME => {:type => ::Thrift::Types::STRING, :name => 'catName', :optional => true} } def struct_fields; FIELDS; end @@ -2860,15 +2852,11 @@ class UniqueConstraintsRequest CATNAME = 1 DB_NAME = 2 TBL_NAME = 3 - VALIDWRITEIDLIST = 4 - TABLEID = 5 FIELDS = { CATNAME => {:type => ::Thrift::Types::STRING, :name => 'catName'}, DB_NAME => {:type => ::Thrift::Types::STRING, :name => 'db_name'}, - TBL_NAME => {:type => ::Thrift::Types::STRING, :name => 'tbl_name'}, - VALIDWRITEIDLIST => {:type => ::Thrift::Types::STRING, :name => 'validWriteIdList', :optional => true}, - TABLEID => {:type => ::Thrift::Types::I64, :name => 'tableId', :default => -1, :optional => true} + TBL_NAME => {:type => ::Thrift::Types::STRING, :name => 'tbl_name'} } def struct_fields; FIELDS; end @@ -2904,15 +2892,11 @@ class NotNullConstraintsRequest CATNAME = 1 DB_NAME = 2 TBL_NAME = 3 - VALIDWRITEIDLIST = 4 - TABLEID = 5 FIELDS = { CATNAME => {:type => ::Thrift::Types::STRING, :name => 'catName'}, DB_NAME => {:type => ::Thrift::Types::STRING, :name => 'db_name'}, - TBL_NAME => {:type => ::Thrift::Types::STRING, :name => 'tbl_name'}, - VALIDWRITEIDLIST => {:type => ::Thrift::Types::STRING, :name => 'validWriteIdList', :optional => true}, - TABLEID => {:type => ::Thrift::Types::I64, :name => 'tableId', :default => -1, :optional => true} + TBL_NAME => {:type => ::Thrift::Types::STRING, :name => 'tbl_name'} } def struct_fields; FIELDS; end @@ -2948,15 +2932,11 @@ class DefaultConstraintsRequest CATNAME = 1 DB_NAME = 2 TBL_NAME = 3 - VALIDWRITEIDLIST = 4 - TABLEID = 5 FIELDS = { CATNAME => {:type => ::Thrift::Types::STRING, :name => 'catName'}, DB_NAME => {:type => ::Thrift::Types::STRING, :name => 'db_name'}, - TBL_NAME => {:type => ::Thrift::Types::STRING, :name => 'tbl_name'}, - VALIDWRITEIDLIST => {:type => ::Thrift::Types::STRING, :name => 'validWriteIdList', :optional => true}, - TABLEID => {:type => ::Thrift::Types::I64, :name => 'tableId', :default => -1, :optional => true} + TBL_NAME => {:type => ::Thrift::Types::STRING, :name => 'tbl_name'} } def struct_fields; FIELDS; end @@ -2992,15 +2972,11 @@ class CheckConstraintsRequest CATNAME = 1 DB_NAME = 2 TBL_NAME = 3 - VALIDWRITEIDLIST = 4 - TABLEID = 5 FIELDS = { CATNAME => {:type => ::Thrift::Types::STRING, :name => 'catName'}, DB_NAME => {:type => ::Thrift::Types::STRING, :name => 'db_name'}, - TBL_NAME => {:type => ::Thrift::Types::STRING, :name => 'tbl_name'}, - VALIDWRITEIDLIST => {:type => ::Thrift::Types::STRING, :name => 'validWriteIdList', :optional => true}, - TABLEID => {:type => ::Thrift::Types::I64, :name => 'tableId', :default => -1, :optional => true} + TBL_NAME => {:type => ::Thrift::Types::STRING, :name => 'tbl_name'} } def struct_fields; FIELDS; end @@ -3036,15 +3012,11 @@ class AllTableConstraintsRequest DBNAME = 1 TBLNAME = 2 CATNAME = 3 - VALIDWRITEIDLIST = 4 - TABLEID = 5 FIELDS = { DBNAME => {:type => ::Thrift::Types::STRING, :name => 'dbName'}, TBLNAME => {:type => ::Thrift::Types::STRING, :name => 'tblName'}, - CATNAME => {:type => ::Thrift::Types::STRING, :name => 'catName'}, - VALIDWRITEIDLIST => {:type => ::Thrift::Types::STRING, :name => 'validWriteIdList', :optional => true}, - TABLEID => {:type => ::Thrift::Types::I64, :name => 'tableId', :default => -1, :optional => true} + CATNAME => {:type => ::Thrift::Types::STRING, :name => 'catName'} } def struct_fields; FIELDS; end diff --git a/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift b/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift index 2260d6c94546..32071a087be3 100644 --- a/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift +++ b/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift @@ -754,9 +754,7 @@ struct Schema { struct PrimaryKeysRequest { 1: required string db_name, 2: required string tbl_name, - 3: optional string catName, - 4: optional string validWriteIdList, - 5: optional i64 tableId=-1 + 3: optional string catName } struct PrimaryKeysResponse { @@ -767,10 +765,8 @@ struct ForeignKeysRequest { 1: string parent_db_name, 2: string parent_tbl_name, 3: string foreign_db_name, - 4: string foreign_tbl_name, - 5: optional string catName, // No cross catalog constraints - 6: optional string validWriteIdList, - 7: optional i64 tableId=-1 + 4: string foreign_tbl_name + 5: optional string catName // No cross catalog constraints } struct ForeignKeysResponse { @@ -781,8 +777,6 @@ struct UniqueConstraintsRequest { 1: required string catName, 2: required string db_name, 3: required string tbl_name, - 4: optional string validWriteIdList, - 5: optional i64 tableId=-1 } struct UniqueConstraintsResponse { @@ -793,8 +787,6 @@ struct NotNullConstraintsRequest { 1: required string catName, 2: required string db_name, 3: required string tbl_name, - 4: optional string validWriteIdList, - 5: optional i64 tableId=-1 } struct NotNullConstraintsResponse { @@ -804,9 +796,7 @@ struct NotNullConstraintsResponse { struct DefaultConstraintsRequest { 1: required string catName, 2: required string db_name, - 3: required string tbl_name, - 4: optional string validWriteIdList, - 5: optional i64 tableId=-1 + 3: required string tbl_name } struct DefaultConstraintsResponse { @@ -816,9 +806,7 @@ struct DefaultConstraintsResponse { struct CheckConstraintsRequest { 1: required string catName, 2: required string db_name, - 3: required string tbl_name, - 4: optional string validWriteIdList, - 5: optional i64 tableId=-1 + 3: required string tbl_name } struct CheckConstraintsResponse { @@ -828,9 +816,7 @@ struct CheckConstraintsResponse { struct AllTableConstraintsRequest { 1: required string dbName, 2: required string tblName, - 3: required string catName, - 4: optional string validWriteIdList, - 5: optional i64 tableId=-1 + 3: required string catName } struct AllTableConstraintsResponse { diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/CachedStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/CachedStore.java index 4d11854ab5d9..fcd6779054ed 100644 --- a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/CachedStore.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/CachedStore.java @@ -581,7 +581,8 @@ static void prewarm(RawStore rawStore) { } Deadline.startTimer("getAllTableConstraints"); - SQLAllTableConstraints tableConstraints = rawStore.getAllTableConstraints(new AllTableConstraintsRequest(catName, dbName, tblName)); + SQLAllTableConstraints tableConstraints = rawStore.getAllTableConstraints( + new AllTableConstraintsRequest(catName, dbName, tblName)); Deadline.stopTimer(); cacheObjects.setTableConstraints(tableConstraints); @@ -917,7 +918,8 @@ private void updateAllTableConstraints(RawStore rawStore, String catName, String SQLAllTableConstraints constraints = null; try { Deadline.startTimer("getAllTableConstraints"); - constraints = rawStore.getAllTableConstraints(new AllTableConstraintsRequest(catName, dbName, tblName)); + constraints = rawStore.getAllTableConstraints( + new AllTableConstraintsRequest(catName, dbName, tblName)); Deadline.stopTimer(); } catch (MetaException | NoSuchObjectException e) { LOG.info("Updating CachedStore: unable to update table constraints of catalog: " + catName + ", database: " + dbName