github-actions[bot] commented on code in PR #26537:
URL: https://github.com/apache/doris/pull/26537#discussion_r1411792796
##########
be/src/olap/rowset/beta_rowset_writer.cpp:
##########
@@ -541,25 +583,19 @@
return Status::OK();
}
-bool BetaRowsetWriter::_is_segment_overlapping(
- const std::vector<KeyBoundsPB>& segments_encoded_key_bounds) {
- std::string last;
- for (auto segment_encode_key : segments_encoded_key_bounds) {
- auto cur_min = segment_encode_key.min_key();
- auto cur_max = segment_encode_key.max_key();
- if (cur_min <= last) {
- return true;
- }
- last = cur_max;
- }
- return false;
+int64_t BaseBetaRowsetWriter::_num_seg() const {
+ return _num_segment;
+}
+
+int64_t BetaRowsetWriter::_num_seg() const {
+ return _is_segcompacted() ? _num_segcompacted : _num_segment;
}
// update tablet schema when meet variant columns, before commit_txn
// Eg. rowset schema: A(int), B(float), C(int), D(int)
// _tabelt->tablet_schema: A(bigint), B(double)
// => update_schema: A(bigint), B(double), C(int), D(int)
-void BetaRowsetWriter::update_rowset_schema(TabletSchemaSPtr flush_schema) {
+void BaseBetaRowsetWriter::update_rowset_schema(TabletSchemaSPtr flush_schema)
{
Review Comment:
warning: method 'update_rowset_schema' can be made static
[readability-convert-member-functions-to-static]
be/src/olap/rowset/beta_rowset_writer.h:133:
```diff
- void update_rowset_schema(TabletSchemaSPtr flush_schema);
+ static void update_rowset_schema(TabletSchemaSPtr flush_schema);
```
##########
be/src/runtime/tablets_channel.cpp:
##########
@@ -185,14 +203,12 @@ Status TabletsChannel::incremental_open(const
PTabletWriterOpenRequest& params)
return Status::OK();
}
-Status TabletsChannel::close(
- LoadChannel* parent, int sender_id, int64_t backend_id, bool* finished,
- const google::protobuf::RepeatedField<int64_t>& partition_ids,
- google::protobuf::RepeatedPtrField<PTabletInfo>* tablet_vec,
- google::protobuf::RepeatedPtrField<PTabletError>* tablet_errors,
- const google::protobuf::Map<int64_t, PSlaveTabletNodes>&
slave_tablet_nodes,
- google::protobuf::Map<int64_t, PSuccessSlaveTabletNodeIds>*
success_slave_tablet_node_ids,
- const bool write_single_replica) {
+Status TabletsChannel::close(LoadChannel* parent, const
PTabletWriterAddBlockRequest& req,
Review Comment:
warning: function 'close' exceeds recommended size/complexity thresholds
[readability-function-size]
```cpp
Status TabletsChannel::close(LoadChannel* parent, const
PTabletWriterAddBlockRequest& req,
^
```
<details>
<summary>Additional context</summary>
**be/src/runtime/tablets_channel.cpp:205:** 137 lines including whitespace
and comments (threshold 80)
```cpp
Status TabletsChannel::close(LoadChannel* parent, const
PTabletWriterAddBlockRequest& req,
^
```
</details>
##########
be/src/olap/rowset/beta_rowset_writer.cpp:
##########
@@ -460,11 +491,11 @@ Status
BetaRowsetWriter::flush_memtable(vectorized::Block* block, int32_t segmen
return Status::OK();
}
-Status BetaRowsetWriter::flush_single_block(const vectorized::Block* block) {
+Status BaseBetaRowsetWriter::flush_single_block(const vectorized::Block*
block) {
return _segment_creator.flush_single_block(block);
}
-Status BetaRowsetWriter::wait_flying_segcompaction() {
+Status BetaRowsetWriter::_wait_flying_segcompaction() {
Review Comment:
warning: method '_wait_flying_segcompaction' can be made static
[readability-convert-member-functions-to-static]
be/src/olap/rowset/beta_rowset_writer.h:205:
```diff
- Status _wait_flying_segcompaction();
+ static Status _wait_flying_segcompaction();
```
##########
be/src/olap/rowset_builder.cpp:
##########
@@ -343,9 +322,9 @@
return Status::OK();
}
-void RowsetBuilder::_build_current_tablet_schema(int64_t index_id,
- const OlapTableSchemaParam*
table_schema_param,
- const TabletSchema&
ori_tablet_schema) {
+void BaseRowsetBuilder::_build_current_tablet_schema(int64_t index_id,
Review Comment:
warning: method '_build_current_tablet_schema' can be made static
[readability-convert-member-functions-to-static]
be/src/olap/rowset_builder.h:87:
```diff
- void _build_current_tablet_schema(int64_t index_id,
+ static void _build_current_tablet_schema(int64_t index_id,
```
##########
be/src/olap/rowset/segment_v2/segment_writer.cpp:
##########
@@ -336,11 +338,12 @@ void
SegmentWriter::_serialize_block_to_row_column(vectorized::Block& block) {
// 3. set columns to data convertor and then write all columns
Status SegmentWriter::append_block_with_partial_content(const
vectorized::Block* block,
Review Comment:
warning: function 'append_block_with_partial_content' has cognitive
complexity of 51 (threshold 50) [readability-function-cognitive-complexity]
```cpp
Status SegmentWriter::append_block_with_partial_content(const
vectorized::Block* block,
^
```
<details>
<summary>Additional context</summary>
**be/src/olap/rowset/segment_v2/segment_writer.cpp:340:** +1, including
nesting penalty of 0, nesting level increased to 1
```cpp
if constexpr (!std::is_same_v<ExecEnv::Engine, StorageEngine>) {
^
```
**be/src/olap/rowset/segment_v2/segment_writer.cpp:346:** +1, including
nesting penalty of 0, nesting level increased to 1
```cpp
if (block->columns() <= _tablet_schema->num_key_columns() ||
^
```
**be/src/olap/rowset/segment_v2/segment_writer.cpp:399:** +1, including
nesting penalty of 0, nesting level increased to 1
```cpp
if (const vectorized::ColumnWithTypeAndName* delete_sign_column =
^
```
**be/src/olap/rowset/segment_v2/segment_writer.cpp:404:** +2, including
nesting penalty of 1, nesting level increased to 2
```cpp
if (delete_sign_col.size() >= row_pos + num_rows) {
^
```
**be/src/olap/rowset/segment_v2/segment_writer.cpp:418:** +1, including
nesting penalty of 0, nesting level increased to 1
```cpp
for (size_t block_pos = row_pos; block_pos < row_pos + num_rows;
block_pos++) {
^
```
**be/src/olap/rowset/segment_v2/segment_writer.cpp:429:** +2, including
nesting penalty of 1, nesting level increased to 2
```cpp
if (have_input_seq_column) {
^
```
**be/src/olap/rowset/segment_v2/segment_writer.cpp:435:** +2, including
nesting penalty of 1, nesting level increased to 2
```cpp
if (!_tablet_schema->has_sequence_col() || have_input_seq_column) {
^
```
**be/src/olap/rowset/segment_v2/segment_writer.cpp:436:** +3, including
nesting penalty of 2, nesting level increased to 3
```cpp
RETURN_IF_ERROR(_primary_key_index_builder->add_item(key));
^
```
**be/src/common/status.h:523:** expanded from macro 'RETURN_IF_ERROR'
```cpp
do { \
^
```
**be/src/olap/rowset/segment_v2/segment_writer.cpp:436:** +4, including
nesting penalty of 3, nesting level increased to 4
```cpp
RETURN_IF_ERROR(_primary_key_index_builder->add_item(key));
^
```
**be/src/common/status.h:525:** expanded from macro 'RETURN_IF_ERROR'
```cpp
if (UNLIKELY(!_status_.ok())) { \
^
```
**be/src/olap/rowset/segment_v2/segment_writer.cpp:441:** +1
```cpp
(delete_sign_column_data != nullptr &&
delete_sign_column_data[block_pos] != 0);
^
```
**be/src/olap/rowset/segment_v2/segment_writer.cpp:448:** +2, including
nesting penalty of 1, nesting level increased to 2
```cpp
if (st.is<KEY_NOT_FOUND>()) {
^
```
**be/src/olap/rowset/segment_v2/segment_writer.cpp:449:** +3, including
nesting penalty of 2, nesting level increased to 3
```cpp
if (_opts.rowset_ctx->partial_update_info->is_strict_mode) {
^
```
**be/src/olap/rowset/segment_v2/segment_writer.cpp:457:** +3, including
nesting penalty of 2, nesting level increased to 3
```cpp
if
(!_opts.rowset_ctx->partial_update_info->can_insert_new_rows_in_partial_update)
{
^
```
**be/src/olap/rowset/segment_v2/segment_writer.cpp:466:** +2, including
nesting penalty of 1, nesting level increased to 2
```cpp
if (!st.ok() && !st.is<KEY_ALREADY_EXISTS>()) {
^
```
**be/src/olap/rowset/segment_v2/segment_writer.cpp:474:** +2, including
nesting penalty of 1, nesting level increased to 2
```cpp
if (have_delete_sign) {
^
```
**be/src/olap/rowset/segment_v2/segment_writer.cpp:477:** +1, nesting level
increased to 2
```cpp
} else {
^
```
**be/src/olap/rowset/segment_v2/segment_writer.cpp:484:** +2, including
nesting penalty of 1, nesting level increased to 2
```cpp
if (st.is<KEY_ALREADY_EXISTS>()) {
^
```
**be/src/olap/rowset/segment_v2/segment_writer.cpp:490:** +1, nesting level
increased to 2
```cpp
} else {
^
```
**be/src/olap/rowset/segment_v2/segment_writer.cpp:497:** +1, including
nesting penalty of 0, nesting level increased to 1
```cpp
if (config::enable_merge_on_write_correctness_check) {
^
```
**be/src/olap/rowset/segment_v2/segment_writer.cpp:504:** +1, including
nesting penalty of 0, nesting level increased to 1
```cpp
RETURN_IF_ERROR(fill_missing_columns(mutable_full_columns,
use_default_or_null_flag,
^
```
**be/src/common/status.h:523:** expanded from macro 'RETURN_IF_ERROR'
```cpp
do { \
^
```
**be/src/olap/rowset/segment_v2/segment_writer.cpp:504:** +2, including
nesting penalty of 1, nesting level increased to 2
```cpp
RETURN_IF_ERROR(fill_missing_columns(mutable_full_columns,
use_default_or_null_flag,
^
```
**be/src/common/status.h:525:** expanded from macro 'RETURN_IF_ERROR'
```cpp
if (UNLIKELY(!_status_.ok())) { \
^
```
**be/src/olap/rowset/segment_v2/segment_writer.cpp:507:** +1, including
nesting penalty of 0, nesting level increased to 1
```cpp
if (_tablet_schema->store_row_column()) {
^
```
**be/src/olap/rowset/segment_v2/segment_writer.cpp:531:** +1, including
nesting penalty of 0, nesting level increased to 1
```cpp
if (_tablet_schema->has_sequence_col() && !have_input_seq_column) {
^
```
**be/src/olap/rowset/segment_v2/segment_writer.cpp:538:** +2, including
nesting penalty of 1, nesting level increased to 2
```cpp
if (_num_rows_written != row_pos ||
^
```
**be/src/olap/rowset/segment_v2/segment_writer.cpp:545:** +2, including
nesting penalty of 1, nesting level increased to 2
```cpp
for (size_t block_pos = row_pos; block_pos < row_pos + num_rows;
block_pos++) {
^
```
**be/src/olap/rowset/segment_v2/segment_writer.cpp:548:** +3, including
nesting penalty of 2, nesting level increased to 3
```cpp
RETURN_IF_ERROR(_primary_key_index_builder->add_item(key));
^
```
**be/src/common/status.h:523:** expanded from macro 'RETURN_IF_ERROR'
```cpp
do { \
^
```
**be/src/olap/rowset/segment_v2/segment_writer.cpp:548:** +4, including
nesting penalty of 3, nesting level increased to 4
```cpp
RETURN_IF_ERROR(_primary_key_index_builder->add_item(key));
^
```
**be/src/common/status.h:525:** expanded from macro 'RETURN_IF_ERROR'
```cpp
if (UNLIKELY(!_status_.ok())) { \
^
```
</details>
##########
be/src/runtime/tablets_channel.cpp:
##########
@@ -479,8 +494,8 @@
return os;
}
-Status TabletsChannel::add_batch(const PTabletWriterAddBlockRequest& request,
- PTabletWriterAddBlockResult* response) {
+Status BaseTabletsChannel::add_batch(const PTabletWriterAddBlockRequest&
request,
Review Comment:
warning: function 'add_batch' exceeds recommended size/complexity thresholds
[readability-function-size]
```cpp
Status BaseTabletsChannel::add_batch(const PTabletWriterAddBlockRequest&
request,
^
```
<details>
<summary>Additional context</summary>
**be/src/runtime/tablets_channel.cpp:496:** 86 lines including whitespace
and comments (threshold 80)
```cpp
Status BaseTabletsChannel::add_batch(const PTabletWriterAddBlockRequest&
request,
^
```
</details>
##########
be/src/olap/rowset_builder.cpp:
##########
@@ -261,14 +246,14 @@ Status RowsetBuilder::submit_calc_delete_bitmap_task() {
return Status::OK();
}
- LOG(INFO) << "submit calc delete bitmap task to executor, tablet_id: " <<
tablet->tablet_id()
+ LOG(INFO) << "submit calc delete bitmap task to executor, tablet_id: " <<
tablet()->tablet_id()
<< ", txn_id: " << _req.txn_id;
- return tablet->commit_phase_update_delete_bitmap(_rowset, _rowset_ids,
_delete_bitmap, segments,
- _req.txn_id,
_calc_delete_bitmap_token.get(),
- nullptr);
+ return tablet()->commit_phase_update_delete_bitmap(_rowset, _rowset_ids,
_delete_bitmap,
+ segments, _req.txn_id,
+
_calc_delete_bitmap_token.get(), nullptr);
}
-Status RowsetBuilder::wait_calc_delete_bitmap() {
+Status BaseRowsetBuilder::wait_calc_delete_bitmap() {
Review Comment:
warning: method 'wait_calc_delete_bitmap' can be made static
[readability-convert-member-functions-to-static]
be/src/olap/rowset_builder.h:65:
```diff
- Status wait_calc_delete_bitmap();
+ static Status wait_calc_delete_bitmap();
```
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
