Skip to content

Commit

Permalink
[fix](partial update) fix a mem leak issue (apache#37706)
Browse files Browse the repository at this point in the history
we should avoid to use raw pointer
  • Loading branch information
zhannngchen authored Jul 12, 2024
1 parent 24b41fc commit 6312b58
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions be/src/olap/base_tablet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -829,29 +829,27 @@ Status BaseTablet::sort_block(vectorized::Block& in_block, vectorized::Block& ou
vectorized::MutableBlock mutable_output_block =
vectorized::MutableBlock::build_mutable_block(&output_block);

std::vector<RowInBlock*> _row_in_blocks;
_row_in_blocks.reserve(in_block.rows());

std::shared_ptr<RowInBlockComparator> vec_row_comparator =
std::make_shared<RowInBlockComparator>(_tablet_meta->tablet_schema().get());
vec_row_comparator->set_block(&mutable_input_block);

std::vector<RowInBlock*> row_in_blocks;
std::vector<std::unique_ptr<RowInBlock>> row_in_blocks;
DCHECK(in_block.rows() <= std::numeric_limits<int>::max());
row_in_blocks.reserve(in_block.rows());
for (size_t i = 0; i < in_block.rows(); ++i) {
row_in_blocks.emplace_back(new RowInBlock {i});
row_in_blocks.emplace_back(std::make_unique<RowInBlock>(i));
}
std::sort(row_in_blocks.begin(), row_in_blocks.end(),
[&](const RowInBlock* l, const RowInBlock* r) -> bool {
auto value = (*vec_row_comparator)(l, r);
[&](const std::unique_ptr<RowInBlock>& l,
const std::unique_ptr<RowInBlock>& r) -> bool {
auto value = (*vec_row_comparator)(l.get(), r.get());
DCHECK(value != 0) << "value equel when sort block, l_pos: " << l->_row_pos
<< " r_pos: " << r->_row_pos;
return value < 0;
});
std::vector<uint32_t> row_pos_vec;
row_pos_vec.reserve(in_block.rows());
for (auto* block : row_in_blocks) {
for (auto& block : row_in_blocks) {
row_pos_vec.emplace_back(block->_row_pos);
}
return mutable_output_block.add_rows(&in_block, row_pos_vec.data(),
Expand Down

0 comments on commit 6312b58

Please sign in to comment.