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.

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

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

Closed
wants to merge 2 commits into from

Conversation

TomaYoko
Copy link
Contributor

Proposed changes

Issue Number: close #34333

Further comments

If this is a relatively large or complex change, kick off the discussion at dev@doris.apache.org by explaining why you chose the solution you did and what alternatives you considered, etc...

@doris-robot
Copy link

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR

Since 2024-03-18, the Document has been moved to doris-website.
See Doris Document.

Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

clang-tidy made some suggestions

@@ -98,120 +98,131 @@ Status VSortedRunMerger::prepare(const vector<BlockSupplier>& input_runs) {
}

Status VSortedRunMerger::get_next(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' has cognitive complexity of 64 (threshold 50) [readability-function-cognitive-complexity]

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

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

        if (_pending_cursor != nullptr) {
        ^

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

            if (has_next_block(cursor)) {
            ^

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

        if (_priority_queue.empty()) {
        ^

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

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

be/src/vec/runtime/vsorted_run_merger.cpp:119: +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:119: +1

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

be/src/vec/runtime/vsorted_run_merger.cpp:120: +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:122: +4, including nesting penalty of 3, nesting level increased to 4

                    if (_pipeline_engine_enabled) {
                    ^

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

                } else {
                  ^

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

            if (current->isFirst()) {
            ^

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

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

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

                    if (_pipeline_engine_enabled) {
                    ^

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

                } else {
                  ^

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

            } else {
              ^

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

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

be/src/vec/runtime/vsorted_run_merger.cpp:148: +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:155: +4, including nesting penalty of 3, nesting level increased to 4

                    if (_pipeline_engine_enabled) {
                    ^

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

                } else {
                  ^

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

        } else {
          ^

be/src/vec/runtime/vsorted_run_merger.cpp:172: +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:181: +2, including nesting penalty of 1, nesting level increased to 2

            while (!_priority_queue.empty()) {
            ^

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

                if (_offset > 0) {
                ^

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

                } else {
                  ^

be/src/vec/runtime/vsorted_run_merger.cpp:188: +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:197: +3, including nesting penalty of 2, nesting level increased to 3

                if (!next_heap(current)) {
                ^

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

                if (merged_rows == _batch_size) {
                ^

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

            if (merged_rows == 0) {
            ^

be/src/vec/runtime/vsorted_run_merger.cpp:214: +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:214: +1

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

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

    } catch (const std::runtime_error& e) {
      ^

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

    } catch (...) {
      ^

Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

clang-tidy made some suggestions

@@ -98,120 +98,127 @@ Status VSortedRunMerger::prepare(const vector<BlockSupplier>& input_runs) {
}

Status VSortedRunMerger::get_next(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' has cognitive complexity of 64 (threshold 50) [readability-function-cognitive-complexity]

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

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

        if (_pending_cursor != nullptr) {
        ^

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

            if (has_next_block(cursor)) {
            ^

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

        if (_priority_queue.empty()) {
        ^

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

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

be/src/vec/runtime/vsorted_run_merger.cpp:119: +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:119: +1

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

be/src/vec/runtime/vsorted_run_merger.cpp:120: +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:122: +4, including nesting penalty of 3, nesting level increased to 4

                    if (_pipeline_engine_enabled) {
                    ^

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

                } else {
                  ^

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

            if (current->isFirst()) {
            ^

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

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

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

                    if (_pipeline_engine_enabled) {
                    ^

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

                } else {
                  ^

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

            } else {
              ^

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

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

be/src/vec/runtime/vsorted_run_merger.cpp:148: +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:154: +4, including nesting penalty of 3, nesting level increased to 4

                    if (_pipeline_engine_enabled) {
                    ^

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

                } else {
                  ^

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

        } else {
          ^

be/src/vec/runtime/vsorted_run_merger.cpp:170: +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:179: +2, including nesting penalty of 1, nesting level increased to 2

            while (!_priority_queue.empty()) {
            ^

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

                if (_offset > 0) {
                ^

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

                } else {
                  ^

be/src/vec/runtime/vsorted_run_merger.cpp:186: +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:194: +3, including nesting penalty of 2, nesting level increased to 3

                if (!next_heap(current)) {
                ^

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

                if (merged_rows == _batch_size) {
                ^

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

            if (merged_rows == 0) {
            ^

be/src/vec/runtime/vsorted_run_merger.cpp:211: +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:211: +1

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

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

    } catch (const std::runtime_error& e) {
      ^

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

    } catch (...) {
      ^

@TomaYoko TomaYoko closed this Apr 30, 2024
@TomaYoko TomaYoko deleted the fix_34333 branch May 7, 2024 02:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug] BE Crash while sql executing and is non-reproducible
3 participants