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

Fix ret overwrite and avoid use 500 tenant memory

Browse Source
This commit is contained in:
Hongqin-Li
2023-08-01 15:42:45 +00:00
committed by ob-robot
parent 5977466b19
commit ee5fa3b2de
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/resolver/ddl/ob_alter_table_resolver.cpp
View File

@ -855,7 +855,7 @@ int ObAlterTableResolver::resolve_action_list(const ParseNode &node)
} }
//deal with drop column affer drop constraint (mysql mode) //deal with drop column affer drop constraint (mysql mode)
if (OB_SUCC(ret) && lib::is_mysql_mode() && drop_col_act_position_list.count() > 0) { if (OB_SUCC(ret) && lib::is_mysql_mode() && drop_col_act_position_list.count() > 0) {
for (uint64_t i = 0; i < drop_col_act_position_list.count(); ++i) { for (uint64_t i = 0; OB_SUCC(ret) && i < drop_col_act_position_list.count(); ++i) {
if (OB_FAIL(resolve_drop_column_nodes_for_mysql(*node.children_[drop_col_act_position_list.at(i)], reduced_visible_col_set))) { if (OB_FAIL(resolve_drop_column_nodes_for_mysql(*node.children_[drop_col_act_position_list.at(i)], reduced_visible_col_set))) {
SQL_RESV_LOG(WARN, "Resolve drop column error!", K(ret)); SQL_RESV_LOG(WARN, "Resolve drop column error!", K(ret));
} }

3
src/storage/ddl/ob_ddl_redo_log_replayer.cpp
View File

@ -39,8 +39,7 @@ ObDDLRedoLogReplayer::~ObDDLRedoLogReplayer()
int ObDDLRedoLogReplayer::init(ObLS *ls) int ObDDLRedoLogReplayer::init(ObLS *ls)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
ObMemAttr attr(OB_SERVER_TENANT_ID, "RedoLogBuckLock"); ObMemAttr attr(ls->get_tenant_id(), "RedoLogBuckLock");
SET_USE_500(attr);
if (OB_UNLIKELY(is_inited_)) { if (OB_UNLIKELY(is_inited_)) {
ret = OB_INIT_TWICE; ret = OB_INIT_TWICE;
LOG_WARN("ObDDLRedoLogReplayer has been inited twice", K(ret)); LOG_WARN("ObDDLRedoLogReplayer has been inited twice", K(ret));

2
src/storage/ls/ob_ls_ddl_log_handler.cpp
View File

@ -41,7 +41,7 @@ int ObLSDDLLogHandler::init(ObLS *ls)
} else if (nullptr == ls) { } else if (nullptr == ls) {
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid argument", K(ret)); LOG_WARN("invalid argument", K(ret));
} else if (ddl_log_replayer_.init(ls)) { } else if (OB_FAIL(ddl_log_replayer_.init(ls))) {
LOG_WARN("fail to init ddl log replayer", K(ret)); LOG_WARN("fail to init ddl log replayer", K(ret));
} else { } else {
TCWLockGuard guard(online_lock_); TCWLockGuard guard(online_lock_);