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

Fix direct load reset mem_ctx

Browse Source
This commit is contained in:
suz-yang 2024-01-02 11:22:19 +00:00 committed by ob-robot
parent 23d6bea577
commit a85a30bc6c
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/observer/table_load/ob_table_load_mem_compactor.cpp
View File

@ -575,9 +575,6 @@ int ObTableLoadMemCompactor::finish()
LOG_WARN("fail to start parallel merge", KR(ret));
}
}
if (OB_SUCC(ret)) {
mem_ctx_.reset(); // mem_ctx的tables已经copy，需要提前释放
}
return ret;
}
@ -608,6 +605,9 @@ int ObTableLoadMemCompactor::build_result_for_heap_table()
}
}
}
if (OB_SUCC(ret)) {
mem_ctx_.reset();
}
return ret;
}
@ -625,6 +625,9 @@ int ObTableLoadMemCompactor::add_table_to_parallel_merge_ctx()
LOG_WARN("fail to add tablet sstable", KR(ret));
}
}
if (OB_SUCC(ret)) {
mem_ctx_.reset(); // mem_ctx的tables已经copy，需要提前释放
}
return ret;
}

6
src/observer/table_load/ob_table_load_multiple_heap_table_compactor.cpp
View File

@ -496,9 +496,6 @@ int ObTableLoadMultipleHeapTableCompactor::finish()
} else if (OB_FAIL(compact_ctx_->handle_table_compact_success())) {
LOG_WARN("fail to handle_table_compact_success", KR(ret));
}
if (OB_SUCC(ret)) {
mem_ctx_.reset(); // mem_ctx的tables已经copy，需要提前释放
}
return ret;
}
@ -529,6 +526,9 @@ int ObTableLoadMultipleHeapTableCompactor::build_result_for_heap_table()
}
}
}
if (OB_SUCC(ret)) {
mem_ctx_.reset(); // mem_ctx的tables已经copy，需要提前释放
}
return ret;
}