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](SortMerger)add error throwing mechanism #34533

Closed
wants to merge 3 commits into from
Closed

[fix](SortMerger)add error throwing mechanism #34533

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28e864d
[fix](SortMerger)add error throwing mechanism
yoko123yoko May 8, 2024
ad6aa94
[fix](SortMerger)add error throwing mechanism
yoko123yoko May 8, 2024
dfc5240
Merge branch 'fix34333' of github.com:TomaYoko/doris into fix34333
yoko123yoko May 8, 2024
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
11 changes: 10 additions & 1 deletion be/src/vec/runtime/vsorted_run_merger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,17 @@ Status VSortedRunMerger::prepare(const vector<BlockSupplier>& input_runs) {

return Status::OK();
}

Status VSortedRunMerger::get_next(Block* output_block, bool* eos) {
try {
get_next_data(output_block, eos);
} catch (const std::runtime_error& e) {
return Status::RuntimeError(e.what());
} catch (...) {
return Status::RuntimeError("SortMerger error");
}
}

Status VSortedRunMerger::get_next_data(Block* output_block, bool* eos) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: function 'get_next_data' has cognitive complexity of 62 (threshold 50) [readability-function-cognitive-complexity]

Status VSortedRunMerger::get_next_data(Block* output_block, bool* eos) {
                         ^
Additional context

be/src/vec/runtime/vsorted_run_merger.cpp:114: +1, including nesting penalty of 0, nesting level increased to 1

    if (_pending_cursor != nullptr) {
    ^

be/src/vec/runtime/vsorted_run_merger.cpp:116: +2, including nesting penalty of 1, nesting level increased to 2

        if (has_next_block(cursor)) {
        ^

be/src/vec/runtime/vsorted_run_merger.cpp:122: +1, including nesting penalty of 0, nesting level increased to 1

    if (_priority_queue.empty()) {
    ^

be/src/vec/runtime/vsorted_run_merger.cpp:125: +1, nesting level increased to 1

    } else if (_priority_queue.size() == 1) {
           ^

be/src/vec/runtime/vsorted_run_merger.cpp:127: +2, including nesting penalty of 1, nesting level increased to 2

        while (_offset != 0 && current->block_ptr() != nullptr) {
        ^

be/src/vec/runtime/vsorted_run_merger.cpp:127: +1

        while (_offset != 0 && current->block_ptr() != nullptr) {
                            ^

be/src/vec/runtime/vsorted_run_merger.cpp:128: +3, including nesting penalty of 2, nesting level increased to 3

            if (_offset >= current->rows - current->pos) {
            ^

be/src/vec/runtime/vsorted_run_merger.cpp:130: +4, including nesting penalty of 3, nesting level increased to 4

                if (_pipeline_engine_enabled) {
                ^

be/src/vec/runtime/vsorted_run_merger.cpp:136: +1, nesting level increased to 3

            } else {
              ^

be/src/vec/runtime/vsorted_run_merger.cpp:142: +2, including nesting penalty of 1, nesting level increased to 2

        if (current->isFirst()) {
        ^

be/src/vec/runtime/vsorted_run_merger.cpp:143: +3, including nesting penalty of 2, nesting level increased to 3

            if (current->block_ptr() != nullptr) {
            ^

be/src/vec/runtime/vsorted_run_merger.cpp:145: +4, including nesting penalty of 3, nesting level increased to 4

                if (_pipeline_engine_enabled) {
                ^

be/src/vec/runtime/vsorted_run_merger.cpp:151: +1, nesting level increased to 3

            } else {
              ^

be/src/vec/runtime/vsorted_run_merger.cpp:154: +1, nesting level increased to 2

        } else {
          ^

be/src/vec/runtime/vsorted_run_merger.cpp:155: +3, including nesting penalty of 2, nesting level increased to 3

            if (current->block_ptr() != nullptr) {
            ^

be/src/vec/runtime/vsorted_run_merger.cpp:156: +4, including nesting penalty of 3, nesting level increased to 4

                for (int i = 0; i < current->all_columns.size(); i++) {
                ^

be/src/vec/runtime/vsorted_run_merger.cpp:162: +4, including nesting penalty of 3, nesting level increased to 4

                if (_pipeline_engine_enabled) {
                ^

be/src/vec/runtime/vsorted_run_merger.cpp:168: +1, nesting level increased to 3

            } else {
              ^

be/src/vec/runtime/vsorted_run_merger.cpp:172: +1, nesting level increased to 1

    } else {
      ^

be/src/vec/runtime/vsorted_run_merger.cpp:178: +2, including nesting penalty of 1, nesting level increased to 2

        if (num_columns != merged_columns.size()) {
        ^

be/src/vec/runtime/vsorted_run_merger.cpp:187: +2, including nesting penalty of 1, nesting level increased to 2

        while (!_priority_queue.empty()) {
        ^

be/src/vec/runtime/vsorted_run_merger.cpp:191: +3, including nesting penalty of 2, nesting level increased to 3

            if (_offset > 0) {
            ^

be/src/vec/runtime/vsorted_run_merger.cpp:193: +1, nesting level increased to 3

            } else {
              ^

be/src/vec/runtime/vsorted_run_merger.cpp:194: +4, including nesting penalty of 3, nesting level increased to 4

                for (size_t i = 0; i < num_columns; ++i) {
                ^

be/src/vec/runtime/vsorted_run_merger.cpp:201: +3, including nesting penalty of 2, nesting level increased to 3

            if (!next_heap(current)) {
            ^

be/src/vec/runtime/vsorted_run_merger.cpp:205: +3, including nesting penalty of 2, nesting level increased to 3

            if (merged_rows == _batch_size) {
            ^

be/src/vec/runtime/vsorted_run_merger.cpp:211: +2, including nesting penalty of 1, nesting level increased to 2

        if (merged_rows == 0) {
        ^

be/src/vec/runtime/vsorted_run_merger.cpp:218: +1, including nesting penalty of 0, nesting level increased to 1

    if (_limit != -1 && _num_rows_returned >= _limit) {
    ^

be/src/vec/runtime/vsorted_run_merger.cpp:218: +1

    if (_limit != -1 && _num_rows_returned >= _limit) {
                     ^

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: function 'get_next_data' exceeds recommended size/complexity thresholds [readability-function-size]

Status VSortedRunMerger::get_next_data(Block* output_block, bool* eos) {
                         ^
Additional context

be/src/vec/runtime/vsorted_run_merger.cpp:108: 115 lines including whitespace and comments (threshold 80)

Status VSortedRunMerger::get_next_data(Block* output_block, bool* eos) {
                         ^

ScopedTimer<MonotonicStopWatch> timer(_get_next_timer);
// Only have one receive data queue of data, no need to do merge and
// copy the data of block.
Expand Down
2 changes: 2 additions & 0 deletions be/src/vec/runtime/vsorted_run_merger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ class VSortedRunMerger {
// Return the next block of sorted rows from this merger.
Status get_next(Block* output_block, bool* eos);

Status get_next_data(Block* output_block, bool* eos);

void set_pipeline_engine_enabled(bool value) { _pipeline_engine_enabled = value; }

protected:
Expand Down
Loading