From acc4327715ce815ddbe9f8caa2d0fa4712ffbc8a Mon Sep 17 00:00:00 2001 From: obdev Date: Fri, 22 Apr 2022 16:49:51 +0800 Subject: [PATCH] Fix ObSchema::reset() related bugs --- src/share/schema/ob_column_schema.cpp | 2 +- src/share/schema/ob_outline_mgr.cpp | 2 +- src/share/schema/ob_schema_mgr.cpp | 20 ++++++++------------ src/share/schema/ob_synonym_mgr.cpp | 2 +- src/share/schema/ob_sys_variable_mgr.cpp | 2 +- src/share/schema/ob_udf_mgr.cpp | 2 +- 6 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/share/schema/ob_column_schema.cpp b/src/share/schema/ob_column_schema.cpp index 29aa990c9d..04968804b1 100644 --- a/src/share/schema/ob_column_schema.cpp +++ b/src/share/schema/ob_column_schema.cpp @@ -242,8 +242,8 @@ void ObColumnSchemaV2::reset() prev_column_id_ = UINT64_MAX; next_column_id_ = UINT64_MAX; encoding_type_ = INT64_MAX; - ObSchema::reset(); reset_string_array(extended_type_info_); + ObSchema::reset(); } OB_DEF_SERIALIZE(ObColumnSchemaV2) diff --git a/src/share/schema/ob_outline_mgr.cpp b/src/share/schema/ob_outline_mgr.cpp index 486ba19c53..28c7afc1fb 100644 --- a/src/share/schema/ob_outline_mgr.cpp +++ b/src/share/schema/ob_outline_mgr.cpp @@ -84,7 +84,6 @@ bool ObSimpleOutlineSchema::operator==(const ObSimpleOutlineSchema& other) const void ObSimpleOutlineSchema::reset() { - ObSchema::reset(); tenant_id_ = OB_INVALID_ID; outline_id_ = OB_INVALID_ID; schema_version_ = OB_INVALID_VERSION; @@ -92,6 +91,7 @@ void ObSimpleOutlineSchema::reset() name_.reset(); signature_.reset(); sql_id_.reset(); + ObSchema::reset(); } bool ObSimpleOutlineSchema::is_valid() const diff --git a/src/share/schema/ob_schema_mgr.cpp b/src/share/schema/ob_schema_mgr.cpp index 0379547226..cee63781d3 100644 --- a/src/share/schema/ob_schema_mgr.cpp +++ b/src/share/schema/ob_schema_mgr.cpp @@ -98,7 +98,6 @@ bool ObSimpleTenantSchema::operator==(const ObSimpleTenantSchema& other) const void ObSimpleTenantSchema::reset() { - ObSchema::reset(); tenant_id_ = OB_INVALID_ID; schema_version_ = OB_INVALID_VERSION; tenant_name_.reset(); @@ -112,6 +111,7 @@ void ObSimpleTenantSchema::reset() drop_tenant_time_ = 0; status_ = TENANT_STATUS_NORMAL; in_recyclebin_ = false; + ObSchema::reset(); } bool ObSimpleTenantSchema::is_valid() const @@ -192,13 +192,13 @@ bool ObSimpleUserSchema::operator==(const ObSimpleUserSchema& other) const void ObSimpleUserSchema::reset() { - ObSchema::reset(); tenant_id_ = OB_INVALID_ID; user_id_ = OB_INVALID_ID; schema_version_ = OB_INVALID_VERSION; user_name_.reset(); host_name_.reset(); type_ = OB_USER; + ObSchema::reset(); } bool ObSimpleUserSchema::is_valid() const @@ -278,7 +278,6 @@ bool ObSimpleDatabaseSchema::operator==(const ObSimpleDatabaseSchema& other) con void ObSimpleDatabaseSchema::reset() { - ObSchema::reset(); tenant_id_ = OB_INVALID_ID; database_id_ = OB_INVALID_ID; schema_version_ = OB_INVALID_VERSION; @@ -286,6 +285,7 @@ void ObSimpleDatabaseSchema::reset() database_name_.reset(); name_case_mode_ = OB_NAME_CASE_INVALID; drop_schema_version_ = OB_INVALID_VERSION; + ObSchema::reset(); } bool ObSimpleDatabaseSchema::is_valid() const @@ -375,7 +375,6 @@ bool ObSimpleTablegroupSchema::operator==(const ObSimpleTablegroupSchema& other) void ObSimpleTablegroupSchema::reset() { - ObSchema::reset(); tenant_id_ = OB_INVALID_ID; tablegroup_id_ = OB_INVALID_ID; schema_version_ = OB_INVALID_VERSION; @@ -387,6 +386,7 @@ void ObSimpleTablegroupSchema::reset() is_mock_global_index_invalid_ = false; binding_ = false; partition_schema_version_ = 0; // Issues left over from history, set to 0 + ObSchema::reset(); } bool ObSimpleTablegroupSchema::is_valid() const @@ -1963,7 +1963,6 @@ int ObSchemaMgr::add_table(const ObSimpleTableSchemaV2& table_schema) new_table_schema->get_origin_index_name_str()); if (is_oracle_mode) { // Function ObCharset::hash in index_name_map_.set_refactored relys on is_oracle_mode() - // https://work.aone.alibaba-inc.com/issue/32719845 CompatModeGuard g(ObWorker::CompatMode::ORACLE); hash_ret = index_name_map_.set_refactored(cutted_index_name_wrapper, new_table_schema, over_write); } else { @@ -2617,7 +2616,7 @@ int ObSchemaMgr::del_table(const ObTenantTableId table) K(hash_ret), "index_name", schema_to_del->get_table_name()); - // 增加增量schema刷新的容错处理，此时不报错，靠rebuild逻辑解 + // Add fault tolerance for incremental schema refresh. No error is reported here. Resolve it by rebuild logic. ret = OB_HASH_NOT_EXIST != hash_ret ? hash_ret : ret; } } else { // index is not in recyclebin @@ -2631,7 +2630,6 @@ int ObSchemaMgr::del_table(const ObTenantTableId table) schema_to_del->get_origin_index_name_str()); if (is_oracle_mode) { // Function ObCharset::hash in index_name_map_.set_refactored relys on is_oracle_mode() - // https://work.aone.alibaba-inc.com/issue/32719845 CompatModeGuard g(ObWorker::CompatMode::ORACLE); hash_ret = index_name_map_.erase_refactored(cutted_index_name_wrapper); } else { @@ -2919,7 +2917,8 @@ int ObSchemaMgr::get_index_schema(const uint64_t tenant_id, const uint64_t datab } } } else { // not in recyclebin - // FIXME: oracle模式暂不支持drop user/database to recyclebin，暂时可以基于database_id判断索引是否在回收站中 + // FIXME:(xiaofeng.lby) Oracle mode does not support dropping user/database to recyclebin. + // You can temporarily determine if the index is in the recycle bin based on the database_id. ObString cutted_index_name; ObSimpleTableSchemaV2 tmp_schema_for_cutting_ind_name; tmp_schema_for_cutting_ind_name.reset(); @@ -2944,7 +2943,6 @@ int ObSchemaMgr::get_index_schema(const uint64_t tenant_id, const uint64_t datab tenant_id, database_id, is_oracle_mode ? common::OB_INVALID_ID : data_table_id, cutted_index_name); if (is_oracle_mode) { // Function ObCharset::hash in index_name_map_.set_refactored relys on is_oracle_mode() - // https://work.aone.alibaba-inc.com/issue/32719845 CompatModeGuard g(ObWorker::CompatMode::ORACLE); hash_ret = index_name_map_.get_refactored(cutted_index_name_wrapper, tmp_schema); } else { @@ -3624,7 +3622,7 @@ int ObSchemaMgr::deal_with_table_rename( int hash_ret = index_name_map_.erase_refactored(index_name_wrapper); if (OB_SUCCESS != hash_ret) { LOG_WARN("fail to delete index from index name hashmap", K(ret), K(hash_ret), K(old_table_name)); - // 增加增量schema刷新的容错处理，此时不报错，靠rebuild逻辑解 + // Add fault tolerance for incremental schema refresh. No error is reported at this time. Resolve it by rebuild logic. ret = OB_HASH_NOT_EXIST != hash_ret ? hash_ret : ret; } } else { // index is not in recyclebin @@ -3639,7 +3637,6 @@ int ObSchemaMgr::deal_with_table_rename( cutted_index_name); if (is_oracle_mode) { // Function ObCharset::hash in index_name_map_.set_refactored relys on is_oracle_mode() - // https://work.aone.alibaba-inc.com/issue/32719845 CompatModeGuard g(ObWorker::CompatMode::ORACLE); hash_ret = index_name_map_.erase_refactored(cutted_index_name_wrapper); } else { @@ -3801,7 +3798,6 @@ int ObSchemaMgr::rebuild_table_hashmap(uint64_t& fk_cnt, uint64_t& cst_cnt) table_schema->get_origin_index_name_str()); if (is_oracle_mode) { // Function ObCharset::hash in index_name_map_.set_refactored relys on is_oracle_mode() - // https://work.aone.alibaba-inc.com/issue/32719845 CompatModeGuard g(ObWorker::CompatMode::ORACLE); hash_ret = index_name_map_.set_refactored(cutted_index_name_wrapper, table_schema, over_write); } else { diff --git a/src/share/schema/ob_synonym_mgr.cpp b/src/share/schema/ob_synonym_mgr.cpp index 55801305a5..7830710762 100644 --- a/src/share/schema/ob_synonym_mgr.cpp +++ b/src/share/schema/ob_synonym_mgr.cpp @@ -240,7 +240,6 @@ ObSimpleSynonymSchema& ObSimpleSynonymSchema::operator=(const ObSimpleSynonymSch void ObSimpleSynonymSchema::reset() { - ObSchema::reset(); tenant_id_ = OB_INVALID_ID; synonym_id_ = OB_INVALID_ID; schema_version_ = OB_INVALID_VERSION; @@ -249,6 +248,7 @@ void ObSimpleSynonymSchema::reset() object_database_id_ = OB_INVALID_ID; synonym_name_.reset(); object_name_.reset(); + ObSchema::reset(); } bool ObSimpleSynonymSchema::is_valid() const diff --git a/src/share/schema/ob_sys_variable_mgr.cpp b/src/share/schema/ob_sys_variable_mgr.cpp index 7df4019e27..0583381a9a 100644 --- a/src/share/schema/ob_sys_variable_mgr.cpp +++ b/src/share/schema/ob_sys_variable_mgr.cpp @@ -56,11 +56,11 @@ ObSimpleSysVariableSchema::~ObSimpleSysVariableSchema() void ObSimpleSysVariableSchema::reset() { - ObSchema::reset(); tenant_id_ = OB_INVALID_ID; schema_version_ = OB_INVALID_VERSION; name_case_mode_ = OB_NAME_CASE_INVALID; read_only_ = false; + ObSchema::reset(); } bool ObSimpleSysVariableSchema::is_valid() const diff --git a/src/share/schema/ob_udf_mgr.cpp b/src/share/schema/ob_udf_mgr.cpp index c2d7e9680e..d6eefc36c6 100644 --- a/src/share/schema/ob_udf_mgr.cpp +++ b/src/share/schema/ob_udf_mgr.cpp @@ -69,11 +69,11 @@ ObSimpleUDFSchema::~ObSimpleUDFSchema() void ObSimpleUDFSchema::reset() { - ObSchema::reset(); tenant_id_ = OB_INVALID_ID; schema_version_ = OB_INVALID_VERSION; udf_id_ = OB_INVALID_ID; udf_name_.reset(); + ObSchema::reset(); } bool ObSimpleUDFSchema::is_valid() const