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

Fix memory leak

Browse Source
This commit is contained in:
obdev
2023-02-24 12:28:19 +00:00
committed by ob-robot
parent 1ce0caed61
commit aba13e9668
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/storage/direct_load/ob_direct_load_mem_context.cpp
View File

@ -2,6 +2,7 @@
#include "storage/direct_load/ob_direct_load_mem_context.h"
#include "storage/direct_load/ob_direct_load_mem_loader.h"
#include "storage/direct_load/ob_direct_load_mem_dump.h"
namespace oceanbase
{
@ -55,7 +56,12 @@ int ObMemDumpQueue::pop(void *&p)
ObMemDumpQueue::~ObMemDumpQueue()
{
for (int64_t i = 0; i < queue_.size(); i ++) {
int ret = OB_SUCCESS;
int64_t queue_size = queue_.size();
if (queue_size > 0) {
STORAGE_LOG(ERROR, "mem dump queue should be empty", K(queue_size));
}
for (int64_t i = 0; i < queue_size; i ++) {
void *tmp = nullptr;
queue_.pop(tmp);
if (tmp != nullptr) {
@ -97,6 +103,17 @@ void ObDirectLoadMemContext::reset()
}
}
int64_t queue_size = mem_dump_queue_.size();
for (int64_t i = 0; i < queue_size; i ++) {
void *p = nullptr;
mem_dump_queue_.pop(p);
if (p != nullptr) {
ObDirectLoadMemDump *mem_dump = (ObDirectLoadMemDump *)p;
mem_dump->~ObDirectLoadMemDump();
ob_free(mem_dump);
}
}
for (int64_t i = 0; i < tables_.count(); i ++) {
ObIDirectLoadPartitionTable *table = tables_.at(i);
if (table != nullptr) {

3
src/storage/direct_load/ob_direct_load_mem_context.h
View File

@ -33,6 +33,9 @@ public:
int init(int64_t capacity) {
return queue_.init(capacity);
}
int64_t size() const {
return queue_.size();
}
private:
common::LightyQueue queue_;
};