Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[fix](merge-iterator) Fix mem leak when get next batch failed #41671

Open
wants to merge 1 commit into
base: branch-1.2-lts
Choose a base branch
from
+13 −18
Open

[fix](merge-iterator) Fix mem leak when get next batch failed #41671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions be/src/vec/olap/vgeneric_iterators.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

#include <vec/olap/vgeneric_iterators.h>

#include <algorithm>
#include <memory>
#include <queue>
#include <utility>
Expand Down Expand Up @@ -321,13 +322,13 @@ Status VMergeIterator::init(const StorageReadOptions& opts) {
_record_rowids = opts.record_rowids;

for (auto iter : _origin_iters) {
auto ctx = std::make_unique<VMergeIteratorContext>(
auto ctx = std::make_shared<VMergeIteratorContext>(
iter, _sequence_id_idx, _is_unique, _is_reverse, opts.read_orderby_key_columns);
RETURN_IF_ERROR(ctx->init(opts));
if (!ctx->valid()) {
continue;
}
_merge_heap.push(ctx.release());
_merge_heap.push(ctx);
}

_origin_iters.clear();
Expand Down
26 changes: 10 additions & 16 deletions be/src/vec/olap/vgeneric_iterators.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
// specific language governing permissions and limitations
// under the License.

#include <memory>

#include "olap/iterators.h"
#include "olap/row.h"
#include "olap/row_block2.h"
Expand Down Expand Up @@ -181,13 +183,7 @@ class VMergeIterator : public RowwiseIterator {
_is_reverse(is_reverse),
_merged_rows(merged_rows) {}

~VMergeIterator() override {
while (!_merge_heap.empty()) {
auto ctx = _merge_heap.top();
_merge_heap.pop();
delete ctx;
}
}
~VMergeIterator() override = default;

Status init(const StorageReadOptions& opts) override;

Expand Down Expand Up @@ -221,7 +217,7 @@ class VMergeIterator : public RowwiseIterator {
_block_row_locations.resize(_block_row_max);
}
size_t row_idx = 0;
VMergeIteratorContext* pre_ctx = nullptr;
std::shared_ptr<VMergeIteratorContext> pre_ctx;
while (_get_size(block) < _block_row_max) {
if (_merge_heap.empty()) {
break;
Expand All @@ -238,7 +234,7 @@ class VMergeIterator : public RowwiseIterator {
}
pre_ctx = ctx;
}
pre_ctx->set_pre_ctx_same(ctx);
pre_ctx->set_pre_ctx_same(ctx.get());
if (UNLIKELY(_record_rowids)) {
_block_row_locations[row_idx] = ctx->current_row_location();
}
Expand All @@ -261,9 +257,6 @@ class VMergeIterator : public RowwiseIterator {
RETURN_IF_ERROR(ctx->advance());
if (ctx->valid()) {
_merge_heap.push(ctx);
} else {
// Release ctx earlier to reduce resource consumed
delete ctx;
}
}
if (!_merge_heap.empty()) {
Expand All @@ -284,14 +277,15 @@ class VMergeIterator : public RowwiseIterator {
const Schema* _schema = nullptr;

struct VMergeContextComparator {
bool operator()(const VMergeIteratorContext* lhs, const VMergeIteratorContext* rhs) const {
bool operator()(const std::shared_ptr<VMergeIteratorContext>& lhs,
const std::shared_ptr<VMergeIteratorContext>& rhs) const {
return lhs->compare(*rhs);
}
};

using VMergeHeap =
std::priority_queue<VMergeIteratorContext*, std::vector<VMergeIteratorContext*>,
VMergeContextComparator>;
using VMergeHeap = std::priority_queue<std::shared_ptr<VMergeIteratorContext>,
std::vector<std::shared_ptr<VMergeIteratorContext>>,
VMergeContextComparator>;

VMergeHeap _merge_heap;

Expand Down
Loading