This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 2b240b330ab fix compile
2b240b330ab is described below
commit 2b240b330abea5af3100805a3d3724a743c950ba
Author: yiguolei <yiguo...@gmail.com>
AuthorDate: Wed May 22 01:01:52 2024 +0800
fix compile
---
be/src/olap/tablet.cpp | 8 ++++----
be/src/olap/tablet.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/be/src/olap/tablet.cpp b/be/src/olap/tablet.cpp
index f0867b4a19d..52f7910625e 100644
--- a/be/src/olap/tablet.cpp
+++ b/be/src/olap/tablet.cpp
@@ -2785,7 +2785,7 @@ Status Tablet::_load_rowset_segments(const
RowsetSharedPtr& rowset,
return Status::OK();
}
-void Tablet::sort_block(vectorized::Block& in_block, vectorized::Block&
output_block) {
+Status Tablet::sort_block(vectorized::Block& in_block, vectorized::Block&
output_block) {
vectorized::MutableBlock mutable_input_block =
vectorized::MutableBlock::build_mutable_block(&in_block);
vectorized::MutableBlock mutable_output_block =
@@ -2816,8 +2816,8 @@ void Tablet::sort_block(vectorized::Block& in_block,
vectorized::Block& output_b
for (int i = 0; i < row_in_blocks.size(); i++) {
row_pos_vec.emplace_back(row_in_blocks[i]->_row_pos);
}
- mutable_output_block.add_rows(&in_block, row_pos_vec.data(),
- row_pos_vec.data() + in_block.rows());
+ RETURN_IF_ERROR(mutable_output_block.add_rows(&in_block,
row_pos_vec.data(),
+ row_pos_vec.data() +
in_block.rows()));
}
Status Tablet::calc_segment_delete_bitmap(RowsetSharedPtr rowset,
@@ -3001,7 +3001,7 @@ Status Tablet::calc_segment_delete_bitmap(RowsetSharedPtr
rowset,
RETURN_IF_ERROR(generate_new_block_for_partial_update(
rowset_schema, partial_update_info->missing_cids,
partial_update_info->update_cids,
read_plan_ori, read_plan_update, rsid_to_rowset, &block));
- sort_block(block, ordered_block);
+ RETURN_IF_ERROR(sort_block(block, ordered_block));
RETURN_IF_ERROR(rowset_writer->flush_single_block(&ordered_block));
}
LOG(INFO) << "calc segment delete bitmap, tablet: " << tablet_id() << "
rowset: " << rowset_id
diff --git a/be/src/olap/tablet.h b/be/src/olap/tablet.h
index 6eb63648b9a..f0f152e41f6 100644
--- a/be/src/olap/tablet.h
+++ b/be/src/olap/tablet.h
@@ -511,7 +511,7 @@ public:
const std::map<RowsetSharedPtr, std::list<std::pair<RowLocation,
RowLocation>>>&
location_map);
Status all_rs_id(int64_t max_version, RowsetIdUnorderedSet* rowset_ids)
const;
- void sort_block(vectorized::Block& in_block, vectorized::Block&
output_block);
+ Status sort_block(vectorized::Block& in_block, vectorized::Block&
output_block);
bool check_all_rowset_segment();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
