hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Interm Result Management is Splitted to Tenants

Browse Source
This commit is contained in:
obdev
2023-10-19 06:39:26 +00:00
committed by ob-robot
parent c72190a2c0
commit a68da2aa9c
17 changed files with 249 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/observer/omt/ob_multi_tenant.cpp
View File

@ -132,6 +132,7 @@
#include "rootserver/ob_heartbeat_service.h"
#include "share/detect/ob_detect_manager.h"
#include "observer/table/ttl/ob_ttl_service.h"
#include "sql/dtl/ob_dtl_interm_result_manager.h"
#ifdef ERRSIM
#include "share/errsim_module/ob_tenant_errsim_module_mgr.h"
#include "share/errsim_module/ob_tenant_errsim_event_mgr.h"
@ -515,6 +516,8 @@ int ObMultiTenant::init(ObAddr myaddr,
MTL_BIND2(server_obj_pool_mtl_new<ObTableScanIterator>, nullptr, nullptr, nullptr, nullptr, server_obj_pool_mtl_destroy<ObTableScanIterator>);
MTL_BIND(ObDetectManager::mtl_init, ObDetectManager::mtl_destroy);
MTL_BIND(ObTenantSQLSessionMgr::mtl_init, ObTenantSQLSessionMgr::mtl_destroy);
MTL_BIND2(mtl_new_default, ObDTLIntermResultManager::mtl_init, ObDTLIntermResultManager::mtl_start,
ObDTLIntermResultManager::mtl_stop, ObDTLIntermResultManager::mtl_wait, ObDTLIntermResultManager::mtl_destroy);
if (GCONF._enable_new_sql_nio && GCONF._enable_tenant_sql_net_thread) {
MTL_BIND2(nullptr, nullptr, start_mysql_queue, mtl_stop_default,
mtl_wait_default, mtl_destroy_default);
@ -1687,11 +1690,6 @@ int ObMultiTenant::remove_tenant(const uint64_t tenant_id, bool &remove_tenant_s
LOG_WARN("failed to delete_tenant_usage_stat", K(ret), K(tenant_id));
}
}
if (OB_SUCC(ret)) {
if (OB_FAIL(dtl::ObDTLIntermResultManager::getInstance().erase_tenant_interm_result_info(tenant_id))) {
LOG_WARN("failed to erase_tenant_interm_result_info", K(ret), K(tenant_id));
}
}
if (OB_SUCC(ret)) {
// only report event when ret = success