diff --git a/deps/oblib/src/lib/alloc/alloc_struct.h b/deps/oblib/src/lib/alloc/alloc_struct.h index 25da6091c2..0299bd629c 100644 --- a/deps/oblib/src/lib/alloc/alloc_struct.h +++ b/deps/oblib/src/lib/alloc/alloc_struct.h @@ -160,6 +160,12 @@ inline ObMemAttr DoNotUseMe(const ObLabel &label) return DoNotUseMe(attr); } +inline ObMemAttr DoNotUseMe(const ObLabel &label, const uint64_t ctx_id) +{ + ObMemAttr attr(OB_SERVER_TENANT_ID, label, ctx_id); + return DoNotUseMe(attr); +} + #define SET_USE_500(args...) ::oceanbase::lib::DoNotUseMe(args) struct AllocHelper diff --git a/deps/oblib/src/lib/allocator/ob_mod_define.h b/deps/oblib/src/lib/allocator/ob_mod_define.h index f92ce6635b..2be7f7b07a 100644 --- a/deps/oblib/src/lib/allocator/ob_mod_define.h +++ b/deps/oblib/src/lib/allocator/ob_mod_define.h @@ -31,6 +31,7 @@ CTX_ITEM_DEF(RPC_CTX_ID) CTX_ITEM_DEF(PKT_NIO) CTX_ITEM_DEF(TX_DATA_TABLE) CTX_ITEM_DEF(STORAGE_LONG_TERM_META_CTX_ID) +CTX_ITEM_DEF(SCHEMA_SERVICE) CTX_ITEM_DEF(MAX_CTX_ID) #endif diff --git a/src/share/schema/ob_context_mgr.cpp b/src/share/schema/ob_context_mgr.cpp index 15bb1a253d..35c0136384 100644 --- a/src/share/schema/ob_context_mgr.cpp +++ b/src/share/schema/ob_context_mgr.cpp @@ -83,19 +83,19 @@ ObContextHashWrapper ObGetContextKey ObContextMgr::ObContextMgr() : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(local_allocator_), - context_infos_(0, NULL, SET_USE_500("SchemaContext")), - context_map_(SET_USE_500("SchemaContext")) + context_infos_(0, NULL, SET_USE_500("SchemaContext", ObCtxIds::SCHEMA_SERVICE)), + context_map_(SET_USE_500("SchemaContext", ObCtxIds::SCHEMA_SERVICE)) { } ObContextMgr::ObContextMgr(ObIAllocator &allocator) : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(allocator), - context_infos_(0, NULL, SET_USE_500("SchemaContext")), - context_map_(SET_USE_500("SchemaContext")) + context_infos_(0, NULL, SET_USE_500("SchemaContext", ObCtxIds::SCHEMA_SERVICE)), + context_map_(SET_USE_500("SchemaContext", ObCtxIds::SCHEMA_SERVICE)) { } diff --git a/src/share/schema/ob_dblink_mgr.cpp b/src/share/schema/ob_dblink_mgr.cpp index f9ff00bb00..f30f59881d 100644 --- a/src/share/schema/ob_dblink_mgr.cpp +++ b/src/share/schema/ob_dblink_mgr.cpp @@ -28,20 +28,20 @@ using namespace common; using namespace common::hash; ObDbLinkMgr::ObDbLinkMgr() - : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(local_allocator_), - dblink_schemas_(0, NULL, SET_USE_500("DBLINK_MGR")), - dblink_id_map_(SET_USE_500("DBLINK_MGR")), - dblink_name_map_(SET_USE_500("DBLINK_MGR")), + dblink_schemas_(0, NULL, SET_USE_500("DBLINK_MGR", ObCtxIds::SCHEMA_SERVICE)), + dblink_id_map_(SET_USE_500("DBLINK_MGR", ObCtxIds::SCHEMA_SERVICE)), + dblink_name_map_(SET_USE_500("DBLINK_MGR", ObCtxIds::SCHEMA_SERVICE)), is_inited_(false) {} ObDbLinkMgr::ObDbLinkMgr(ObIAllocator &allocator) - : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(allocator), - dblink_schemas_(0, NULL, SET_USE_500("DBLINK_MGR")), - dblink_id_map_(SET_USE_500("DBLINK_MGR")), - dblink_name_map_(SET_USE_500("DBLINK_MGR")), + dblink_schemas_(0, NULL, SET_USE_500("DBLINK_MGR", ObCtxIds::SCHEMA_SERVICE)), + dblink_id_map_(SET_USE_500("DBLINK_MGR", ObCtxIds::SCHEMA_SERVICE)), + dblink_name_map_(SET_USE_500("DBLINK_MGR", ObCtxIds::SCHEMA_SERVICE)), is_inited_(false) {} diff --git a/src/share/schema/ob_directory_mgr.cpp b/src/share/schema/ob_directory_mgr.cpp index d0b1fedf10..533def41ed 100644 --- a/src/share/schema/ob_directory_mgr.cpp +++ b/src/share/schema/ob_directory_mgr.cpp @@ -28,21 +28,21 @@ const char *ObDirectoryMgr::DIRECTORY_MGR = "DIRECTORY_MGR"; ObDirectoryMgr::ObDirectoryMgr() : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(local_allocator_), - directory_infos_(0, NULL, SET_USE_500(DIRECTORY_MGR)), - directory_name_map_(SET_USE_500(DIRECTORY_MGR)), - directory_id_map_(SET_USE_500(DIRECTORY_MGR)) + directory_infos_(0, NULL, SET_USE_500(DIRECTORY_MGR, ObCtxIds::SCHEMA_SERVICE)), + directory_name_map_(SET_USE_500(DIRECTORY_MGR, ObCtxIds::SCHEMA_SERVICE)), + directory_id_map_(SET_USE_500(DIRECTORY_MGR, ObCtxIds::SCHEMA_SERVICE)) { } ObDirectoryMgr::ObDirectoryMgr(common::ObIAllocator &allocator) : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(allocator), - directory_infos_(0, NULL, SET_USE_500(DIRECTORY_MGR)), - directory_name_map_(SET_USE_500(DIRECTORY_MGR)), - directory_id_map_(SET_USE_500(DIRECTORY_MGR)) + directory_infos_(0, NULL, SET_USE_500(DIRECTORY_MGR, ObCtxIds::SCHEMA_SERVICE)), + directory_name_map_(SET_USE_500(DIRECTORY_MGR, ObCtxIds::SCHEMA_SERVICE)), + directory_id_map_(SET_USE_500(DIRECTORY_MGR, ObCtxIds::SCHEMA_SERVICE)) { } diff --git a/src/share/schema/ob_keystore_mgr.cpp b/src/share/schema/ob_keystore_mgr.cpp index c52ddd9759..04377760c1 100644 --- a/src/share/schema/ob_keystore_mgr.cpp +++ b/src/share/schema/ob_keystore_mgr.cpp @@ -28,18 +28,18 @@ using namespace common::hash; ObKeystoreMgr::ObKeystoreMgr() : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(local_allocator_), - keystore_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_KEYSTORE)), - keystore_map_(SET_USE_500(ObModIds::OB_SCHEMA_KEYSTORE)) + keystore_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_KEYSTORE, ObCtxIds::SCHEMA_SERVICE)), + keystore_map_(SET_USE_500(ObModIds::OB_SCHEMA_KEYSTORE, ObCtxIds::SCHEMA_SERVICE)) { } ObKeystoreMgr::ObKeystoreMgr(ObIAllocator &allocator) : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(allocator), - keystore_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_KEYSTORE)), - keystore_map_(SET_USE_500(ObMemAttr(OB_SERVER_TENANT_ID, ObModIds::OB_SCHEMA_KEYSTORE))) + keystore_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_KEYSTORE, ObCtxIds::SCHEMA_SERVICE)), + keystore_map_(SET_USE_500(ObMemAttr(OB_SERVER_TENANT_ID, ObModIds::OB_SCHEMA_KEYSTORE, ObCtxIds::SCHEMA_SERVICE))) { } ObKeystoreMgr::~ObKeystoreMgr() diff --git a/src/share/schema/ob_label_se_policy_mgr.cpp b/src/share/schema/ob_label_se_policy_mgr.cpp index 3c82468d02..4b5958183d 100644 --- a/src/share/schema/ob_label_se_policy_mgr.cpp +++ b/src/share/schema/ob_label_se_policy_mgr.cpp @@ -29,24 +29,24 @@ using namespace hash; ObLabelSePolicyMgr::ObLabelSePolicyMgr() : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(local_allocator_), - schema_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_POLICY)), - policy_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_POLICY)), - column_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_POLICY)), - id_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_POLICY)) + schema_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_POLICY, ObCtxIds::SCHEMA_SERVICE)), + policy_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_POLICY, ObCtxIds::SCHEMA_SERVICE)), + column_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_POLICY, ObCtxIds::SCHEMA_SERVICE)), + id_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_POLICY, ObCtxIds::SCHEMA_SERVICE)) { } ObLabelSePolicyMgr::ObLabelSePolicyMgr(ObIAllocator &allocator) : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(allocator), - schema_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_POLICY)), - policy_name_map_(SET_USE_500(ObMemAttr(OB_SERVER_TENANT_ID, ObModIds::OB_SCHEMA_LABEL_SE_POLICY))), - column_name_map_(SET_USE_500(ObMemAttr(OB_SERVER_TENANT_ID, ObModIds::OB_SCHEMA_LABEL_SE_POLICY))), - id_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_POLICY)) + schema_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_POLICY, ObCtxIds::SCHEMA_SERVICE)), + policy_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_POLICY, ObCtxIds::SCHEMA_SERVICE)), + column_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_POLICY, ObCtxIds::SCHEMA_SERVICE)), + id_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_POLICY, ObCtxIds::SCHEMA_SERVICE)) { } @@ -466,26 +466,26 @@ int ObLabelSePolicyMgr::get_schema_statistics(ObSchemaStatisticsInfo &schema_inf ObLabelSeCompMgr::ObLabelSeCompMgr() : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(local_allocator_), - schema_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_COMPONENT)), - short_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_COMPONENT)), - long_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_COMPONENT)), - id_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_COMPONENT)), - num_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_COMPONENT)) + schema_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_COMPONENT, ObCtxIds::SCHEMA_SERVICE)), + short_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_COMPONENT, ObCtxIds::SCHEMA_SERVICE)), + long_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_COMPONENT, ObCtxIds::SCHEMA_SERVICE)), + id_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_COMPONENT, ObCtxIds::SCHEMA_SERVICE)), + num_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_COMPONENT, ObCtxIds::SCHEMA_SERVICE)) { } ObLabelSeCompMgr::ObLabelSeCompMgr(ObIAllocator &allocator) : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(allocator), - schema_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_COMPONENT)), - short_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_COMPONENT)), - long_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_COMPONENT)), - id_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_COMPONENT)), - num_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_COMPONENT)) + schema_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_COMPONENT, ObCtxIds::SCHEMA_SERVICE)), + short_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_COMPONENT, ObCtxIds::SCHEMA_SERVICE)), + long_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_COMPONENT, ObCtxIds::SCHEMA_SERVICE)), + id_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_COMPONENT, ObCtxIds::SCHEMA_SERVICE)), + num_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_COMPONENT, ObCtxIds::SCHEMA_SERVICE)) { } @@ -1049,24 +1049,24 @@ int ObLabelSeCompMgr::get_schema_statistics(ObSchemaStatisticsInfo &schema_info) ObLabelSeLabelMgr::ObLabelSeLabelMgr() : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(local_allocator_), - schema_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_LABEL)), - label_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_LABEL)), - id_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_LABEL)), - tag_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_LABEL)) + schema_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_LABEL, ObCtxIds::SCHEMA_SERVICE)), + label_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_LABEL, ObCtxIds::SCHEMA_SERVICE)), + id_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_LABEL, ObCtxIds::SCHEMA_SERVICE)), + tag_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_LABEL, ObCtxIds::SCHEMA_SERVICE)) { } ObLabelSeLabelMgr::ObLabelSeLabelMgr(ObIAllocator &allocator) : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(allocator), - schema_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_LABEL)), - label_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_LABEL)), - id_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_LABEL)), - tag_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_LABEL)) + schema_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_LABEL, ObCtxIds::SCHEMA_SERVICE)), + label_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_LABEL, ObCtxIds::SCHEMA_SERVICE)), + id_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_LABEL, ObCtxIds::SCHEMA_SERVICE)), + tag_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_LABEL, ObCtxIds::SCHEMA_SERVICE)) { } @@ -1559,22 +1559,22 @@ int ObLabelSeLabelMgr::get_schema_statistics(ObSchemaStatisticsInfo &schema_info ObLabelSeUserLevelMgr::ObLabelSeUserLevelMgr() : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(local_allocator_), - schema_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_USER_LEVEL)), - user_level_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_USER_LEVEL)), - id_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_USER_LEVEL)) + schema_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_USER_LEVEL, ObCtxIds::SCHEMA_SERVICE)), + user_level_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_USER_LEVEL, ObCtxIds::SCHEMA_SERVICE)), + id_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_USER_LEVEL, ObCtxIds::SCHEMA_SERVICE)) { } ObLabelSeUserLevelMgr::ObLabelSeUserLevelMgr(ObIAllocator &allocator) : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(allocator), - schema_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_USER_LEVEL)), - user_level_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_USER_LEVEL)), - id_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_USER_LEVEL)) + schema_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_USER_LEVEL, ObCtxIds::SCHEMA_SERVICE)), + user_level_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_USER_LEVEL, ObCtxIds::SCHEMA_SERVICE)), + id_map_(SET_USE_500(ObModIds::OB_SCHEMA_LABEL_SE_USER_LEVEL, ObCtxIds::SCHEMA_SERVICE)) { } diff --git a/src/share/schema/ob_mock_fk_parent_table_mgr.cpp b/src/share/schema/ob_mock_fk_parent_table_mgr.cpp index ec79dfbfab..c9739e4a17 100644 --- a/src/share/schema/ob_mock_fk_parent_table_mgr.cpp +++ b/src/share/schema/ob_mock_fk_parent_table_mgr.cpp @@ -87,19 +87,19 @@ ObMockFKParentTableHashWrapper ObGetMockFKParentTableKey< ObMockFKParentTableMgr::ObMockFKParentTableMgr() : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(local_allocator_), - mock_fk_parent_table_infos_(0, NULL, SET_USE_500("MockFkParentTab")), - mock_fk_parent_table_map_(SET_USE_500("MockFkParentTab")) + mock_fk_parent_table_infos_(0, NULL, SET_USE_500("MockFkParentTab", ObCtxIds::SCHEMA_SERVICE)), + mock_fk_parent_table_map_(SET_USE_500("MockFkParentTab", ObCtxIds::SCHEMA_SERVICE)) { } ObMockFKParentTableMgr::ObMockFKParentTableMgr(ObIAllocator &allocator) : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(allocator), - mock_fk_parent_table_infos_(0, NULL, SET_USE_500("MockFkParentTab")), - mock_fk_parent_table_map_(SET_USE_500("MockFkParentTab")) + mock_fk_parent_table_infos_(0, NULL, SET_USE_500("MockFkParentTab", ObCtxIds::SCHEMA_SERVICE)), + mock_fk_parent_table_map_(SET_USE_500("MockFkParentTab", ObCtxIds::SCHEMA_SERVICE)) { } diff --git a/src/share/schema/ob_multi_version_schema_service.cpp b/src/share/schema/ob_multi_version_schema_service.cpp index 0143232f2a..5138f60eca 100644 --- a/src/share/schema/ob_multi_version_schema_service.cpp +++ b/src/share/schema/ob_multi_version_schema_service.cpp @@ -79,7 +79,7 @@ const char *ObMultiVersionSchemaService::print_refresh_schema_mode(const Refresh ObSchemaConstructTask::ObSchemaConstructTask() { - schema_tasks_.set_attr(SET_USE_500(ObMemAttr(OB_SERVER_TENANT_ID, "SchemaTasks"))); + schema_tasks_.set_attr(SET_USE_500(ObMemAttr(OB_SERVER_TENANT_ID, "SchemaTasks", ObCtxIds::SCHEMA_SERVICE))); (void)pthread_mutex_init(&schema_mutex_, NULL); (void)pthread_cond_init(&schema_cond_, NULL); } diff --git a/src/share/schema/ob_outline_mgr.cpp b/src/share/schema/ob_outline_mgr.cpp index 055f22eb99..3568199248 100644 --- a/src/share/schema/ob_outline_mgr.cpp +++ b/src/share/schema/ob_outline_mgr.cpp @@ -132,24 +132,24 @@ int64_t ObSimpleOutlineSchema::get_convert_size() const } ObOutlineMgr::ObOutlineMgr() - : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(local_allocator_), - outline_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_OUTLINE_INFO_VECTOR)), - outline_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_OUTLINE_ID_MAP)), - outline_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_OUTLINE_NAME_MAP)), - signature_map_(SET_USE_500(ObModIds::OB_SCHEMA_OUTLINE_SQL_MAP)), - sql_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_OUTLINE_SQL_MAP)) + outline_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_OUTLINE_INFO_VECTOR, ObCtxIds::SCHEMA_SERVICE)), + outline_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_OUTLINE_ID_MAP, ObCtxIds::SCHEMA_SERVICE)), + outline_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_OUTLINE_NAME_MAP, ObCtxIds::SCHEMA_SERVICE)), + signature_map_(SET_USE_500(ObModIds::OB_SCHEMA_OUTLINE_SQL_MAP, ObCtxIds::SCHEMA_SERVICE)), + sql_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_OUTLINE_SQL_MAP, ObCtxIds::SCHEMA_SERVICE)) { } ObOutlineMgr::ObOutlineMgr(ObIAllocator &allocator) - : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(allocator), - outline_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_OUTLINE_INFO_VECTOR)), - outline_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_OUTLINE_ID_MAP)), - outline_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_OUTLINE_NAME_MAP)), - signature_map_(SET_USE_500(ObModIds::OB_SCHEMA_OUTLINE_SQL_MAP)), - sql_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_OUTLINE_SQL_MAP)) + outline_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_OUTLINE_INFO_VECTOR, ObCtxIds::SCHEMA_SERVICE)), + outline_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_OUTLINE_ID_MAP, ObCtxIds::SCHEMA_SERVICE)), + outline_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_OUTLINE_NAME_MAP, ObCtxIds::SCHEMA_SERVICE)), + signature_map_(SET_USE_500(ObModIds::OB_SCHEMA_OUTLINE_SQL_MAP, ObCtxIds::SCHEMA_SERVICE)), + sql_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_OUTLINE_SQL_MAP, ObCtxIds::SCHEMA_SERVICE)) { } diff --git a/src/share/schema/ob_package_mgr.cpp b/src/share/schema/ob_package_mgr.cpp index f1f6418072..be38672dd4 100644 --- a/src/share/schema/ob_package_mgr.cpp +++ b/src/share/schema/ob_package_mgr.cpp @@ -76,21 +76,21 @@ int64_t ObSimplePackageSchema::get_convert_size() const } ObPackageMgr::ObPackageMgr() - : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(local_allocator_), - package_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_PACKAGE_INFO_VECTOR)), - package_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_PACKAGE_ID_MAP)), - package_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_PACKAGE_NAME_MAP)), + package_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_PACKAGE_INFO_VECTOR, ObCtxIds::SCHEMA_SERVICE)), + package_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_PACKAGE_ID_MAP, ObCtxIds::SCHEMA_SERVICE)), + package_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_PACKAGE_NAME_MAP, ObCtxIds::SCHEMA_SERVICE)), is_inited_(false) { } ObPackageMgr::ObPackageMgr(ObIAllocator &allocator) - : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(allocator), - package_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_PACKAGE_INFO_VECTOR)), - package_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_PACKAGE_ID_MAP)), - package_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_PACKAGE_NAME_MAP)), + package_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_PACKAGE_INFO_VECTOR, ObCtxIds::SCHEMA_SERVICE)), + package_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_PACKAGE_ID_MAP, ObCtxIds::SCHEMA_SERVICE)), + package_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_PACKAGE_NAME_MAP, ObCtxIds::SCHEMA_SERVICE)), is_inited_(false) { } diff --git a/src/share/schema/ob_priv_mgr.cpp b/src/share/schema/ob_priv_mgr.cpp index 4fdb497829..b2e4e99d4e 100644 --- a/src/share/schema/ob_priv_mgr.cpp +++ b/src/share/schema/ob_priv_mgr.cpp @@ -76,28 +76,28 @@ const char *ObPrivMgr::priv_names_[] = { }; ObPrivMgr::ObPrivMgr() - : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(local_allocator_), - db_privs_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_PRIV_DB_PRIVS)), - table_privs_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_PRIV_TABLE_PRIVS)), - table_priv_map_(SET_USE_500(ObModIds::OB_SCHEMA_PRIV_TABLE_PRIV_MAP)), - obj_privs_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_PRIV_OBJ_PRIVS)), - obj_priv_map_(SET_USE_500(ObModIds::OB_SCHEMA_PRIV_OBJ_PRIV_MAP)), - sys_privs_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_PRIV_SYS_PRIVS)) + db_privs_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_PRIV_DB_PRIVS, ObCtxIds::SCHEMA_SERVICE)), + table_privs_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_PRIV_TABLE_PRIVS, ObCtxIds::SCHEMA_SERVICE)), + table_priv_map_(SET_USE_500(ObModIds::OB_SCHEMA_PRIV_TABLE_PRIV_MAP, ObCtxIds::SCHEMA_SERVICE)), + obj_privs_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_PRIV_OBJ_PRIVS, ObCtxIds::SCHEMA_SERVICE)), + obj_priv_map_(SET_USE_500(ObModIds::OB_SCHEMA_PRIV_OBJ_PRIV_MAP, ObCtxIds::SCHEMA_SERVICE)), + sys_privs_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_PRIV_SYS_PRIVS, ObCtxIds::SCHEMA_SERVICE)) { static_assert(ARRAYSIZEOF(ObPrivMgr::priv_names_) == OB_PRIV_MAX_SHIFT_PLUS_ONE, "incomplete array priv_names_"); } ObPrivMgr::ObPrivMgr(ObIAllocator &allocator) - : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(allocator), - db_privs_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_PRIV_DB_PRIVS)), - table_privs_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_PRIV_TABLE_PRIVS)), - table_priv_map_(SET_USE_500(ObModIds::OB_SCHEMA_PRIV_TABLE_PRIV_MAP)), - obj_privs_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_PRIV_OBJ_PRIVS)), - obj_priv_map_(SET_USE_500(ObModIds::OB_SCHEMA_PRIV_OBJ_PRIV_MAP)), - sys_privs_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_PRIV_SYS_PRIVS)) + db_privs_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_PRIV_DB_PRIVS, ObCtxIds::SCHEMA_SERVICE)), + table_privs_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_PRIV_TABLE_PRIVS, ObCtxIds::SCHEMA_SERVICE)), + table_priv_map_(SET_USE_500(ObModIds::OB_SCHEMA_PRIV_TABLE_PRIV_MAP, ObCtxIds::SCHEMA_SERVICE)), + obj_privs_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_PRIV_OBJ_PRIVS, ObCtxIds::SCHEMA_SERVICE)), + obj_priv_map_(SET_USE_500(ObModIds::OB_SCHEMA_PRIV_OBJ_PRIV_MAP, ObCtxIds::SCHEMA_SERVICE)), + sys_privs_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_PRIV_SYS_PRIVS, ObCtxIds::SCHEMA_SERVICE)) {} ObPrivMgr::~ObPrivMgr() diff --git a/src/share/schema/ob_profile_mgr.cpp b/src/share/schema/ob_profile_mgr.cpp index f863e5acea..3d68b639e6 100644 --- a/src/share/schema/ob_profile_mgr.cpp +++ b/src/share/schema/ob_profile_mgr.cpp @@ -30,20 +30,20 @@ using namespace hash; ObProfileMgr::ObProfileMgr() : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(local_allocator_), - schema_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_PROFILE)), - name_map_(SET_USE_500(ObModIds::OB_SCHEMA_PROFILE)), - id_map_(SET_USE_500(ObModIds::OB_SCHEMA_PROFILE)) + schema_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_PROFILE, ObCtxIds::SCHEMA_SERVICE)), + name_map_(SET_USE_500(ObModIds::OB_SCHEMA_PROFILE, ObCtxIds::SCHEMA_SERVICE)), + id_map_(SET_USE_500(ObModIds::OB_SCHEMA_PROFILE, ObCtxIds::SCHEMA_SERVICE)) { } ObProfileMgr::ObProfileMgr(ObIAllocator &allocator) : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(allocator), - schema_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_PROFILE)), - name_map_(SET_USE_500(ObModIds::OB_SCHEMA_PROFILE)), - id_map_(SET_USE_500(ObModIds::OB_SCHEMA_PROFILE)) + schema_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_PROFILE, ObCtxIds::SCHEMA_SERVICE)), + name_map_(SET_USE_500(ObModIds::OB_SCHEMA_PROFILE, ObCtxIds::SCHEMA_SERVICE)), + id_map_(SET_USE_500(ObModIds::OB_SCHEMA_PROFILE, ObCtxIds::SCHEMA_SERVICE)) { } ObProfileMgr::~ObProfileMgr() diff --git a/src/share/schema/ob_rls_mgr.cpp b/src/share/schema/ob_rls_mgr.cpp index ba80d9a9cf..bf0d879924 100644 --- a/src/share/schema/ob_rls_mgr.cpp +++ b/src/share/schema/ob_rls_mgr.cpp @@ -30,21 +30,21 @@ const char *ObRlsContextMgr::RLS_CONTEXT_MGR = "RLS_CONTEXT_MGR"; ObRlsPolicyMgr::ObRlsPolicyMgr() : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(local_allocator_), - rls_policy_infos_(0, NULL, SET_USE_500(RLS_POLICY_MGR)), - rls_policy_name_map_(SET_USE_500(RLS_POLICY_MGR)), - rls_policy_id_map_(SET_USE_500(RLS_POLICY_MGR)) + rls_policy_infos_(0, NULL, SET_USE_500(RLS_POLICY_MGR, ObCtxIds::SCHEMA_SERVICE)), + rls_policy_name_map_(SET_USE_500(RLS_POLICY_MGR, ObCtxIds::SCHEMA_SERVICE)), + rls_policy_id_map_(SET_USE_500(RLS_POLICY_MGR, ObCtxIds::SCHEMA_SERVICE)) { } ObRlsPolicyMgr::ObRlsPolicyMgr(common::ObIAllocator &allocator) : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(allocator), - rls_policy_infos_(0, NULL, SET_USE_500(RLS_POLICY_MGR)), - rls_policy_name_map_(SET_USE_500(RLS_POLICY_MGR)), - rls_policy_id_map_(SET_USE_500(RLS_POLICY_MGR)) + rls_policy_infos_(0, NULL, SET_USE_500(RLS_POLICY_MGR, ObCtxIds::SCHEMA_SERVICE)), + rls_policy_name_map_(SET_USE_500(RLS_POLICY_MGR, ObCtxIds::SCHEMA_SERVICE)), + rls_policy_id_map_(SET_USE_500(RLS_POLICY_MGR, ObCtxIds::SCHEMA_SERVICE)) { } @@ -506,21 +506,21 @@ int ObRlsPolicyMgr::rebuild_rls_policy_hashmap() ObRlsGroupMgr::ObRlsGroupMgr() : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(local_allocator_), - rls_group_infos_(0, NULL, SET_USE_500(RLS_GROUP_MGR)), - rls_group_name_map_(SET_USE_500(RLS_GROUP_MGR)), - rls_group_id_map_(SET_USE_500(RLS_GROUP_MGR)) + rls_group_infos_(0, NULL, SET_USE_500(RLS_GROUP_MGR, ObCtxIds::SCHEMA_SERVICE)), + rls_group_name_map_(SET_USE_500(RLS_GROUP_MGR, ObCtxIds::SCHEMA_SERVICE)), + rls_group_id_map_(SET_USE_500(RLS_GROUP_MGR, ObCtxIds::SCHEMA_SERVICE)) { } ObRlsGroupMgr::ObRlsGroupMgr(common::ObIAllocator &allocator) : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(allocator), - rls_group_infos_(0, NULL, SET_USE_500(RLS_GROUP_MGR)), - rls_group_name_map_(SET_USE_500(RLS_GROUP_MGR)), - rls_group_id_map_(SET_USE_500(RLS_GROUP_MGR)) + rls_group_infos_(0, NULL, SET_USE_500(RLS_GROUP_MGR, ObCtxIds::SCHEMA_SERVICE)), + rls_group_name_map_(SET_USE_500(RLS_GROUP_MGR, ObCtxIds::SCHEMA_SERVICE)), + rls_group_id_map_(SET_USE_500(RLS_GROUP_MGR, ObCtxIds::SCHEMA_SERVICE)) { } @@ -951,21 +951,21 @@ int ObRlsGroupMgr::rebuild_rls_group_hashmap() ObRlsContextMgr::ObRlsContextMgr() : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(local_allocator_), - rls_context_infos_(0, NULL, SET_USE_500(RLS_CONTEXT_MGR)), - rls_context_name_map_(SET_USE_500(RLS_CONTEXT_MGR)), - rls_context_id_map_(SET_USE_500(RLS_CONTEXT_MGR)) + rls_context_infos_(0, NULL, SET_USE_500(RLS_CONTEXT_MGR, ObCtxIds::SCHEMA_SERVICE)), + rls_context_name_map_(SET_USE_500(RLS_CONTEXT_MGR, ObCtxIds::SCHEMA_SERVICE)), + rls_context_id_map_(SET_USE_500(RLS_CONTEXT_MGR, ObCtxIds::SCHEMA_SERVICE)) { } ObRlsContextMgr::ObRlsContextMgr(common::ObIAllocator &allocator) : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(allocator), - rls_context_infos_(0, NULL, SET_USE_500(RLS_CONTEXT_MGR)), - rls_context_name_map_(SET_USE_500(RLS_CONTEXT_MGR)), - rls_context_id_map_(SET_USE_500(RLS_CONTEXT_MGR)) + rls_context_infos_(0, NULL, SET_USE_500(RLS_CONTEXT_MGR, ObCtxIds::SCHEMA_SERVICE)), + rls_context_name_map_(SET_USE_500(RLS_CONTEXT_MGR, ObCtxIds::SCHEMA_SERVICE)), + rls_context_id_map_(SET_USE_500(RLS_CONTEXT_MGR, ObCtxIds::SCHEMA_SERVICE)) { } diff --git a/src/share/schema/ob_routine_mgr.cpp b/src/share/schema/ob_routine_mgr.cpp index 35c45ba708..b787b9567c 100644 --- a/src/share/schema/ob_routine_mgr.cpp +++ b/src/share/schema/ob_routine_mgr.cpp @@ -101,21 +101,21 @@ int64_t ObSimpleRoutineSchema::get_convert_size() const } ObRoutineMgr::ObRoutineMgr() - : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(local_allocator_), - routine_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_ROUTINE_INFO_VECTOR)), - routine_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_ROUTINE_ID_MAP)), - routine_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_ROUTINE_NAME_MAP)), + routine_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_ROUTINE_INFO_VECTOR, ObCtxIds::SCHEMA_SERVICE)), + routine_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_ROUTINE_ID_MAP, ObCtxIds::SCHEMA_SERVICE)), + routine_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_ROUTINE_NAME_MAP, ObCtxIds::SCHEMA_SERVICE)), is_inited_(false) { } ObRoutineMgr::ObRoutineMgr(ObIAllocator &allocator) - : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(allocator), - routine_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_ROUTINE_INFO_VECTOR)), - routine_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_ROUTINE_ID_MAP)), - routine_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_ROUTINE_NAME_MAP)), + routine_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_ROUTINE_INFO_VECTOR, ObCtxIds::SCHEMA_SERVICE)), + routine_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_ROUTINE_ID_MAP, ObCtxIds::SCHEMA_SERVICE)), + routine_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_ROUTINE_NAME_MAP, ObCtxIds::SCHEMA_SERVICE)), is_inited_(false) { } diff --git a/src/share/schema/ob_schema_getter_guard.cpp b/src/share/schema/ob_schema_getter_guard.cpp index 92cb2ed427..bfe38cf836 100644 --- a/src/share/schema/ob_schema_getter_guard.cpp +++ b/src/share/schema/ob_schema_getter_guard.cpp @@ -87,7 +87,7 @@ ObSchemaMgrInfo::ObSchemaMgrInfo(const ObSchemaMgrInfo &other) } ObSchemaGetterGuard::ObSchemaGetterGuard() - : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_MGR_INFO_ARRAY)), + : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_MGR_INFO_ARRAY, ObCtxIds::SCHEMA_SERVICE)), schema_service_(NULL), session_id_(0), tenant_id_(OB_INVALID_TENANT_ID), @@ -103,7 +103,7 @@ ObSchemaGetterGuard::ObSchemaGetterGuard() } ObSchemaGetterGuard::ObSchemaGetterGuard(const ObSchemaMgrItem::Mod mod) - : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_MGR_INFO_ARRAY)), + : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_MGR_INFO_ARRAY, ObCtxIds::SCHEMA_SERVICE)), schema_service_(NULL), session_id_(0), tenant_id_(OB_INVALID_TENANT_ID), diff --git a/src/share/schema/ob_schema_mem_mgr.cpp b/src/share/schema/ob_schema_mem_mgr.cpp index 6e06bba7dd..180b5fce9c 100644 --- a/src/share/schema/ob_schema_mem_mgr.cpp +++ b/src/share/schema/ob_schema_mem_mgr.cpp @@ -59,7 +59,7 @@ int ObSchemaMemMgr::init(const char *label, const uint64_t tenant_id) { int ret = OB_SUCCESS; - auto attr = SET_USE_500(label); + auto attr = SET_USE_500(label, ObCtxIds::SCHEMA_SERVICE); //FIXME: The memory split of the subsequent 500 tenants is then set to the corresponding tenant_id new(&allocator_[0]) ObArenaAllocator(attr, OB_MALLOC_BIG_BLOCK_SIZE); new(&allocator_[1]) ObArenaAllocator(attr, OB_MALLOC_BIG_BLOCK_SIZE); diff --git a/src/share/schema/ob_schema_mgr.cpp b/src/share/schema/ob_schema_mgr.cpp index 4528b3b403..d8ce1f3b13 100644 --- a/src/share/schema/ob_schema_mgr.cpp +++ b/src/share/schema/ob_schema_mgr.cpp @@ -458,25 +458,25 @@ int ObSimpleTablegroupSchema::get_zone_list( //////////////////////////////////////////////////////////////// ObSchemaMgr::ObSchemaMgr() - : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(local_allocator_), schema_version_(OB_INVALID_VERSION), tenant_id_(OB_INVALID_TENANT_ID), is_consistent_(true), - tenant_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_TENANT_INFO_VEC)), - user_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_USER_INFO_VEC)), - database_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_DB_INFO_VEC)), - database_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_DATABASE_NAME_MAP)), - tablegroup_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_TABLEG_INFO_VEC)), - table_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_TABLE_INFO_VEC)), - index_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_INDEX_INFO_VEC)), - aux_vp_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_AUX_VP_INFO_VEC)), - lob_meta_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_LOB_META_INFO_VEC)), - lob_piece_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_LOB_PIECE_INFO_VEC)), - table_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_TABLE_ID_MAP)), - table_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_TABLE_NAME_MAP)), - index_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_INDEX_NAME_MAP)), - aux_vp_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_AUX_VP_NAME_VEC)), + tenant_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_TENANT_INFO_VEC, ObCtxIds::SCHEMA_SERVICE)), + user_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_USER_INFO_VEC, ObCtxIds::SCHEMA_SERVICE)), + database_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_DB_INFO_VEC, ObCtxIds::SCHEMA_SERVICE)), + database_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_DATABASE_NAME_MAP, ObCtxIds::SCHEMA_SERVICE)), + tablegroup_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_TABLEG_INFO_VEC, ObCtxIds::SCHEMA_SERVICE)), + table_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_TABLE_INFO_VEC, ObCtxIds::SCHEMA_SERVICE)), + index_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_INDEX_INFO_VEC, ObCtxIds::SCHEMA_SERVICE)), + aux_vp_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_AUX_VP_INFO_VEC, ObCtxIds::SCHEMA_SERVICE)), + lob_meta_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_LOB_META_INFO_VEC, ObCtxIds::SCHEMA_SERVICE)), + lob_piece_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_LOB_PIECE_INFO_VEC, ObCtxIds::SCHEMA_SERVICE)), + table_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_TABLE_ID_MAP, ObCtxIds::SCHEMA_SERVICE)), + table_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_TABLE_NAME_MAP, ObCtxIds::SCHEMA_SERVICE)), + index_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_INDEX_NAME_MAP, ObCtxIds::SCHEMA_SERVICE)), + aux_vp_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_AUX_VP_NAME_VEC, ObCtxIds::SCHEMA_SERVICE)), outline_mgr_(allocator_), routine_mgr_(allocator_), priv_mgr_(allocator_), @@ -492,13 +492,13 @@ ObSchemaMgr::ObSchemaMgr() label_se_user_level_mgr_(allocator_), profile_mgr_(allocator_), audit_mgr_(allocator_), - foreign_key_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_FOREIGN_KEY_NAME_MAP)), - constraint_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_CONSTRAINT_NAME_MAP)), + foreign_key_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_FOREIGN_KEY_NAME_MAP, ObCtxIds::SCHEMA_SERVICE)), + constraint_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_CONSTRAINT_NAME_MAP, ObCtxIds::SCHEMA_SERVICE)), sys_variable_mgr_(allocator_), - drop_tenant_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_DROP_TENANT_INFO_VEC)), + drop_tenant_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_DROP_TENANT_INFO_VEC, ObCtxIds::SCHEMA_SERVICE)), keystore_mgr_(allocator_), tablespace_mgr_(allocator_), - hidden_table_name_map_(SET_USE_500("HiddenTblNames")), + hidden_table_name_map_(SET_USE_500("HiddenTblNames", ObCtxIds::SCHEMA_SERVICE)), dblink_mgr_(allocator_), directory_mgr_(allocator_), context_mgr_(allocator_), @@ -510,25 +510,25 @@ ObSchemaMgr::ObSchemaMgr() } ObSchemaMgr::ObSchemaMgr(ObIAllocator &allocator) - : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(allocator), schema_version_(OB_INVALID_VERSION), tenant_id_(OB_INVALID_TENANT_ID), is_consistent_(true), - tenant_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_TENANT_INFO_VEC)), - user_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_TENANT_INFO_VEC)), - database_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_DB_INFO_VEC)), - database_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_DATABASE_NAME_MAP)), - tablegroup_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_TABLEG_INFO_VEC)), - table_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_TABLE_INFO_VEC)), - index_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_INDEX_INFO_VEC)), - aux_vp_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_AUX_VP_INFO_VEC)), - lob_meta_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_LOB_META_INFO_VEC)), - lob_piece_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_LOB_PIECE_INFO_VEC)), - table_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_TABLE_ID_MAP)), - table_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_TABLE_NAME_MAP)), - index_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_INDEX_NAME_MAP)), - aux_vp_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_AUX_VP_NAME_VEC)), + tenant_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_TENANT_INFO_VEC, ObCtxIds::SCHEMA_SERVICE)), + user_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_TENANT_INFO_VEC, ObCtxIds::SCHEMA_SERVICE)), + database_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_DB_INFO_VEC, ObCtxIds::SCHEMA_SERVICE)), + database_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_DATABASE_NAME_MAP, ObCtxIds::SCHEMA_SERVICE)), + tablegroup_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_TABLEG_INFO_VEC, ObCtxIds::SCHEMA_SERVICE)), + table_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_TABLE_INFO_VEC, ObCtxIds::SCHEMA_SERVICE)), + index_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_INDEX_INFO_VEC, ObCtxIds::SCHEMA_SERVICE)), + aux_vp_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_AUX_VP_INFO_VEC, ObCtxIds::SCHEMA_SERVICE)), + lob_meta_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_LOB_META_INFO_VEC, ObCtxIds::SCHEMA_SERVICE)), + lob_piece_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_LOB_PIECE_INFO_VEC, ObCtxIds::SCHEMA_SERVICE)), + table_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_TABLE_ID_MAP, ObCtxIds::SCHEMA_SERVICE)), + table_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_TABLE_NAME_MAP, ObCtxIds::SCHEMA_SERVICE)), + index_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_INDEX_NAME_MAP, ObCtxIds::SCHEMA_SERVICE)), + aux_vp_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_AUX_VP_NAME_VEC, ObCtxIds::SCHEMA_SERVICE)), outline_mgr_(allocator_), routine_mgr_(allocator_), priv_mgr_(allocator_), @@ -544,13 +544,13 @@ ObSchemaMgr::ObSchemaMgr(ObIAllocator &allocator) label_se_user_level_mgr_(allocator_), profile_mgr_(allocator_), audit_mgr_(allocator_), - foreign_key_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_FOREIGN_KEY_NAME_MAP)), - constraint_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_CONSTRAINT_NAME_MAP)), + foreign_key_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_FOREIGN_KEY_NAME_MAP, ObCtxIds::SCHEMA_SERVICE)), + constraint_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_CONSTRAINT_NAME_MAP, ObCtxIds::SCHEMA_SERVICE)), sys_variable_mgr_(allocator_), - drop_tenant_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_DROP_TENANT_INFO_VEC)), + drop_tenant_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_DROP_TENANT_INFO_VEC, ObCtxIds::SCHEMA_SERVICE)), keystore_mgr_(allocator_), tablespace_mgr_(allocator_), - hidden_table_name_map_(SET_USE_500("HiddenTblNames")), + hidden_table_name_map_(SET_USE_500("HiddenTblNames", ObCtxIds::SCHEMA_SERVICE)), dblink_mgr_(allocator_), directory_mgr_(allocator_), context_mgr_(allocator_), diff --git a/src/share/schema/ob_security_audit_mgr.cpp b/src/share/schema/ob_security_audit_mgr.cpp index 6948b63a55..39b1c96c97 100644 --- a/src/share/schema/ob_security_audit_mgr.cpp +++ b/src/share/schema/ob_security_audit_mgr.cpp @@ -71,19 +71,19 @@ struct Deep_Copy_EarlyStopCondition ObSAuditMgr::ObSAuditMgr() : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(local_allocator_), - audit_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_SECURITY_AUDIT)), - audit_map_(SET_USE_500(ObModIds::OB_SCHEMA_SECURITY_AUDIT)) + audit_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_SECURITY_AUDIT, ObCtxIds::SCHEMA_SERVICE)), + audit_map_(SET_USE_500(ObModIds::OB_SCHEMA_SECURITY_AUDIT, ObCtxIds::SCHEMA_SERVICE)) { } ObSAuditMgr::ObSAuditMgr(ObIAllocator &allocator) : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(allocator), - audit_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_SECURITY_AUDIT)), - audit_map_(SET_USE_500(ObModIds::OB_SCHEMA_SECURITY_AUDIT)) + audit_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_SECURITY_AUDIT, ObCtxIds::SCHEMA_SERVICE)), + audit_map_(SET_USE_500(ObModIds::OB_SCHEMA_SECURITY_AUDIT, ObCtxIds::SCHEMA_SERVICE)) { } diff --git a/src/share/schema/ob_sequence_mgr.cpp b/src/share/schema/ob_sequence_mgr.cpp index 6d219b86fd..a360ed9dd8 100644 --- a/src/share/schema/ob_sequence_mgr.cpp +++ b/src/share/schema/ob_sequence_mgr.cpp @@ -232,19 +232,19 @@ ObSequenceHashWrapper ObGetSequenceKeyget_pool()) @@ -5488,7 +5488,7 @@ int ObServerSchemaService::init_schema_struct(uint64_t tenant_id) #define INIT_TENANT_MEM_MGR(map, tenant_id, mem_mgr_label, schema_mgr_label) \ if (OB_FAIL(ret)) { \ } else if (OB_ISNULL(map.get(tenant_id))) { \ - void *buff = ob_malloc(sizeof(ObSchemaMemMgr), mem_mgr_label); \ + void *buff = ob_malloc(sizeof(ObSchemaMemMgr), SET_USE_500(mem_mgr_label, ObCtxIds::SCHEMA_SERVICE)); \ ObSchemaMemMgr *schema_mem_mgr = NULL; \ bool overwrite = true; \ if (OB_ISNULL(buff)) { \ diff --git a/src/share/schema/ob_synonym_mgr.cpp b/src/share/schema/ob_synonym_mgr.cpp index de6854675f..9f922ec863 100644 --- a/src/share/schema/ob_synonym_mgr.cpp +++ b/src/share/schema/ob_synonym_mgr.cpp @@ -118,21 +118,21 @@ int64_t ObSimpleSynonymSchema::get_convert_size() const ObSynonymMgr::ObSynonymMgr() : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(local_allocator_), - synonym_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_SYNONYM)), - synonym_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_SYNONYM)), - synonym_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_SYNONYM)) + synonym_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_SYNONYM, ObCtxIds::SCHEMA_SERVICE)), + synonym_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_SYNONYM, ObCtxIds::SCHEMA_SERVICE)), + synonym_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_SYNONYM, ObCtxIds::SCHEMA_SERVICE)) { } ObSynonymMgr::ObSynonymMgr(ObIAllocator &allocator) : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(allocator), - synonym_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_SYNONYM)), - synonym_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_SYNONYM)), - synonym_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_SYNONYM)) + synonym_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_SYNONYM, ObCtxIds::SCHEMA_SERVICE)), + synonym_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_SYNONYM, ObCtxIds::SCHEMA_SERVICE)), + synonym_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_SYNONYM, ObCtxIds::SCHEMA_SERVICE)) { } diff --git a/src/share/schema/ob_sys_variable_mgr.cpp b/src/share/schema/ob_sys_variable_mgr.cpp index 7de9b4c2b4..12a9b887d2 100644 --- a/src/share/schema/ob_sys_variable_mgr.cpp +++ b/src/share/schema/ob_sys_variable_mgr.cpp @@ -94,19 +94,19 @@ ObSimpleSysVariableSchema &ObSimpleSysVariableSchema::operator =(const ObSimpleS ObSysVariableMgr::ObSysVariableMgr() : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(local_allocator_), - sys_variable_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_SYS_VARIABLE)), - sys_variable_map_(SET_USE_500(ObModIds::OB_SCHEMA_SYS_VARIABLE)) + sys_variable_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_SYS_VARIABLE, ObCtxIds::SCHEMA_SERVICE)), + sys_variable_map_(SET_USE_500(ObModIds::OB_SCHEMA_SYS_VARIABLE, ObCtxIds::SCHEMA_SERVICE)) { } ObSysVariableMgr::ObSysVariableMgr(common::ObIAllocator &allocator) : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(allocator), - sys_variable_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_SYS_VARIABLE)), - sys_variable_map_(SET_USE_500(ObMemAttr(OB_SERVER_TENANT_ID, ObModIds::OB_SCHEMA_SYS_VARIABLE))) + sys_variable_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_SYS_VARIABLE, ObCtxIds::SCHEMA_SERVICE)), + sys_variable_map_(SET_USE_500(ObMemAttr(OB_SERVER_TENANT_ID, ObModIds::OB_SCHEMA_SYS_VARIABLE, ObCtxIds::SCHEMA_SERVICE))) { } diff --git a/src/share/schema/ob_tablespace_mgr.cpp b/src/share/schema/ob_tablespace_mgr.cpp index 9f77a8f76d..3de0d335e6 100644 --- a/src/share/schema/ob_tablespace_mgr.cpp +++ b/src/share/schema/ob_tablespace_mgr.cpp @@ -222,19 +222,19 @@ struct Deep_Copy_EarlyStopCondition /////////////////////////////////////////////////////////////////// ObTablespaceMgr::ObTablespaceMgr() : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(local_allocator_), - tablespace_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_TABLESPACE)), - tablespace_map_(SET_USE_500(ObModIds::OB_SCHEMA_TABLESPACE)) + tablespace_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_TABLESPACE, ObCtxIds::SCHEMA_SERVICE)), + tablespace_map_(SET_USE_500(ObModIds::OB_SCHEMA_TABLESPACE, ObCtxIds::SCHEMA_SERVICE)) { } ObTablespaceMgr::ObTablespaceMgr(ObIAllocator &allocator) : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(allocator), - tablespace_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_TABLESPACE)), - tablespace_map_(SET_USE_500(ObModIds::OB_SCHEMA_TABLESPACE)) + tablespace_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_TABLESPACE, ObCtxIds::SCHEMA_SERVICE)), + tablespace_map_(SET_USE_500(ObModIds::OB_SCHEMA_TABLESPACE, ObCtxIds::SCHEMA_SERVICE)) { } diff --git a/src/share/schema/ob_trigger_mgr.cpp b/src/share/schema/ob_trigger_mgr.cpp index 21172a7702..a39b5440c5 100644 --- a/src/share/schema/ob_trigger_mgr.cpp +++ b/src/share/schema/ob_trigger_mgr.cpp @@ -87,21 +87,21 @@ uint64_t ObSimpleTriggerSchema::get_exec_tenant_id() const } ObTriggerMgr::ObTriggerMgr() - : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(local_allocator_), - trigger_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_TRIGGER_INFO_VECTOR)), - trigger_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_TRIGGER_ID_MAP)), - trigger_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_TRIGGER_NAME_MAP)), + trigger_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_TRIGGER_INFO_VECTOR, ObCtxIds::SCHEMA_SERVICE)), + trigger_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_TRIGGER_ID_MAP, ObCtxIds::SCHEMA_SERVICE)), + trigger_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_TRIGGER_NAME_MAP, ObCtxIds::SCHEMA_SERVICE)), is_inited_(false) { } ObTriggerMgr::ObTriggerMgr(ObIAllocator &allocator) - : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(allocator), - trigger_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_TRIGGER_INFO_VECTOR)), - trigger_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_TRIGGER_ID_MAP)), - trigger_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_TRIGGER_NAME_MAP)), + trigger_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_TRIGGER_INFO_VECTOR, ObCtxIds::SCHEMA_SERVICE)), + trigger_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_TRIGGER_ID_MAP, ObCtxIds::SCHEMA_SERVICE)), + trigger_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_TRIGGER_NAME_MAP, ObCtxIds::SCHEMA_SERVICE)), is_inited_(false) { } diff --git a/src/share/schema/ob_udf_mgr.cpp b/src/share/schema/ob_udf_mgr.cpp index c1c9bec3c8..2d75d12809 100644 --- a/src/share/schema/ob_udf_mgr.cpp +++ b/src/share/schema/ob_udf_mgr.cpp @@ -116,19 +116,19 @@ ObSimpleUDFSchema &ObSimpleUDFSchema::operator =(const ObSimpleUDFSchema &other) ObUDFMgr::ObUDFMgr() : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(local_allocator_), - udf_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_UDF)), - udf_map_(SET_USE_500(ObModIds::OB_SCHEMA_UDF)) + udf_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_UDF, ObCtxIds::SCHEMA_SERVICE)), + udf_map_(SET_USE_500(ObModIds::OB_SCHEMA_UDF, ObCtxIds::SCHEMA_SERVICE)) { } ObUDFMgr::ObUDFMgr(common::ObIAllocator &allocator) : is_inited_(false), - local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(allocator), - udf_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_UDF)), - udf_map_(SET_USE_500(ObModIds::OB_SCHEMA_UDF)) + udf_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_UDF, ObCtxIds::SCHEMA_SERVICE)), + udf_map_(SET_USE_500(ObModIds::OB_SCHEMA_UDF, ObCtxIds::SCHEMA_SERVICE)) { } diff --git a/src/share/schema/ob_udt_mgr.cpp b/src/share/schema/ob_udt_mgr.cpp index bbacd7e619..21e6bb19a7 100644 --- a/src/share/schema/ob_udt_mgr.cpp +++ b/src/share/schema/ob_udt_mgr.cpp @@ -97,21 +97,21 @@ int64_t ObSimpleUDTSchema::get_convert_size() const } ObUDTMgr::ObUDTMgr() - : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(local_allocator_), - udt_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_UDT_INFO_VECTOR)), - type_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_UDT_ID_MAP)), - type_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_UDT_NAME_MAP)), + udt_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_UDT_INFO_VECTOR, ObCtxIds::SCHEMA_SERVICE)), + type_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_UDT_ID_MAP, ObCtxIds::SCHEMA_SERVICE)), + type_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_UDT_NAME_MAP, ObCtxIds::SCHEMA_SERVICE)), is_inited_(false) { } ObUDTMgr::ObUDTMgr(ObIAllocator &allocator) - : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD)), + : local_allocator_(SET_USE_500(ObModIds::OB_SCHEMA_GETTER_GUARD, ObCtxIds::SCHEMA_SERVICE)), allocator_(allocator), - udt_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_UDT_INFO_VECTOR)), - type_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_UDT_ID_MAP)), - type_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_UDT_NAME_MAP)), + udt_infos_(0, NULL, SET_USE_500(ObModIds::OB_SCHEMA_UDT_INFO_VECTOR, ObCtxIds::SCHEMA_SERVICE)), + type_id_map_(SET_USE_500(ObModIds::OB_SCHEMA_UDT_ID_MAP, ObCtxIds::SCHEMA_SERVICE)), + type_name_map_(SET_USE_500(ObModIds::OB_SCHEMA_UDT_NAME_MAP, ObCtxIds::SCHEMA_SERVICE)), is_inited_(false) { }