github-actions[bot] commented on code in PR #35085:
URL: https://github.com/apache/doris/pull/35085#discussion_r1606794128
##########
be/src/vec/core/block.cpp:
##########
@@ -970,44 +970,53 @@
}
}
-void MutableBlock::add_rows(const Block* block, const uint32_t* row_begin,
- const uint32_t* row_end) {
- DCHECK_LE(columns(), block->columns());
- const auto& block_data = block->get_columns_with_type_and_name();
- for (size_t i = 0; i < _columns.size(); ++i) {
- DCHECK_EQ(_data_types[i]->get_name(), block_data[i].type->get_name());
- auto& dst = _columns[i];
- const auto& src = *block_data[i].column.get();
- DCHECK_GE(src.size(), row_end - row_begin);
- dst->insert_indices_from(src, row_begin, row_end);
- }
+Status MutableBlock::add_rows(const Block* block, const uint32_t* row_begin,
+ const uint32_t* row_end) {
+ RETURN_IF_CATCH_EXCEPTION({
+ DCHECK_LE(columns(), block->columns());
+ const auto& block_data = block->get_columns_with_type_and_name();
+ for (size_t i = 0; i < _columns.size(); ++i) {
+ DCHECK_EQ(_data_types[i]->get_name(),
block_data[i].type->get_name());
+ auto& dst = _columns[i];
+ const auto& src = *block_data[i].column.get();
+ DCHECK_GE(src.size(), row_end - row_begin);
+ dst->insert_indices_from(src, row_begin, row_end);
+ }
+ });
+ return Status::OK();
}
-void MutableBlock::add_rows(const Block* block, size_t row_begin, size_t
length) {
- DCHECK_LE(columns(), block->columns());
- const auto& block_data = block->get_columns_with_type_and_name();
- for (size_t i = 0; i < _columns.size(); ++i) {
- DCHECK_EQ(_data_types[i]->get_name(), block_data[i].type->get_name());
- auto& dst = _columns[i];
- const auto& src = *block_data[i].column.get();
- dst->insert_range_from(src, row_begin, length);
- }
+Status MutableBlock::add_rows(const Block* block, size_t row_begin, size_t
length) {
+ RETURN_IF_CATCH_EXCEPTION({
+ DCHECK_LE(columns(), block->columns());
+ const auto& block_data = block->get_columns_with_type_and_name();
+ for (size_t i = 0; i < _columns.size(); ++i) {
+ DCHECK_EQ(_data_types[i]->get_name(),
block_data[i].type->get_name());
+ auto& dst = _columns[i];
+ const auto& src = *block_data[i].column.get();
+ dst->insert_range_from(src, row_begin, length);
+ }
+ });
+ return Status::OK();
}
-void MutableBlock::add_rows(const Block* block, std::vector<int64_t> rows) {
- DCHECK_LE(columns(), block->columns());
- const auto& block_data = block->get_columns_with_type_and_name();
- const size_t length = std::ranges::distance(rows);
- for (size_t i = 0; i < _columns.size(); ++i) {
- DCHECK_EQ(_data_types[i]->get_name(), block_data[i].type->get_name());
- auto& dst = _columns[i];
- const auto& src = *block_data[i].column.get();
- dst->reserve(dst->size() + length);
- for (size_t row : rows) {
- // we can introduce a new function like `insert_assume_reserved`
for IColumn.
- dst->insert_from(src, row);
+Status MutableBlock::add_rows(const Block* block, std::vector<int64_t> rows) {
Review Comment:
warning: method 'add_rows' can be made const
[readability-make-member-function-const]
```suggestion
Status MutableBlock::add_rows(const Block* block, std::vector<int64_t> rows)
const {
```
##########
be/src/vec/core/block.cpp:
##########
@@ -970,44 +970,53 @@
}
}
-void MutableBlock::add_rows(const Block* block, const uint32_t* row_begin,
- const uint32_t* row_end) {
- DCHECK_LE(columns(), block->columns());
- const auto& block_data = block->get_columns_with_type_and_name();
- for (size_t i = 0; i < _columns.size(); ++i) {
- DCHECK_EQ(_data_types[i]->get_name(), block_data[i].type->get_name());
- auto& dst = _columns[i];
- const auto& src = *block_data[i].column.get();
- DCHECK_GE(src.size(), row_end - row_begin);
- dst->insert_indices_from(src, row_begin, row_end);
- }
+Status MutableBlock::add_rows(const Block* block, const uint32_t* row_begin,
+ const uint32_t* row_end) {
+ RETURN_IF_CATCH_EXCEPTION({
+ DCHECK_LE(columns(), block->columns());
+ const auto& block_data = block->get_columns_with_type_and_name();
+ for (size_t i = 0; i < _columns.size(); ++i) {
+ DCHECK_EQ(_data_types[i]->get_name(),
block_data[i].type->get_name());
+ auto& dst = _columns[i];
+ const auto& src = *block_data[i].column.get();
+ DCHECK_GE(src.size(), row_end - row_begin);
+ dst->insert_indices_from(src, row_begin, row_end);
+ }
+ });
+ return Status::OK();
}
-void MutableBlock::add_rows(const Block* block, size_t row_begin, size_t
length) {
- DCHECK_LE(columns(), block->columns());
- const auto& block_data = block->get_columns_with_type_and_name();
- for (size_t i = 0; i < _columns.size(); ++i) {
- DCHECK_EQ(_data_types[i]->get_name(), block_data[i].type->get_name());
- auto& dst = _columns[i];
- const auto& src = *block_data[i].column.get();
- dst->insert_range_from(src, row_begin, length);
- }
+Status MutableBlock::add_rows(const Block* block, size_t row_begin, size_t
length) {
Review Comment:
warning: method 'add_rows' can be made const
[readability-make-member-function-const]
be/src/vec/core/block.h:607:
```diff
- Status add_rows(const Block* block, size_t row_begin, size_t length);
+ Status add_rows(const Block* block, size_t row_begin, size_t length)
const;
```
```suggestion
Status MutableBlock::add_rows(const Block* block, size_t row_begin, size_t
length) const {
```
##########
be/src/vec/core/block.cpp:
##########
@@ -970,44 +970,53 @@ void MutableBlock::add_row(const Block* block, int row) {
}
}
-void MutableBlock::add_rows(const Block* block, const uint32_t* row_begin,
- const uint32_t* row_end) {
- DCHECK_LE(columns(), block->columns());
- const auto& block_data = block->get_columns_with_type_and_name();
- for (size_t i = 0; i < _columns.size(); ++i) {
- DCHECK_EQ(_data_types[i]->get_name(), block_data[i].type->get_name());
- auto& dst = _columns[i];
- const auto& src = *block_data[i].column.get();
- DCHECK_GE(src.size(), row_end - row_begin);
- dst->insert_indices_from(src, row_begin, row_end);
- }
+Status MutableBlock::add_rows(const Block* block, const uint32_t* row_begin,
Review Comment:
warning: method 'add_rows' can be made const
[readability-make-member-function-const]
be/src/vec/core/block.h:606:
```diff
- Status add_rows(const Block* block, const uint32_t* row_begin, const
uint32_t* row_end);
+ Status add_rows(const Block* block, const uint32_t* row_begin, const
uint32_t* row_end) const;
```
be/src/vec/core/block.cpp:973:
```diff
- const uint32_t* row_end) {
+ const uint32_t* row_end) const {
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
