Skip to content

Conversation

@yiguolei
Copy link
Contributor

Reverts #39956

@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.

@yiguolei
Copy link
Contributor Author

run buildall

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

if (merged_rows == batch_size) {
break;
}
if (merged_rows == batch_size) break;
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: statement should be inside braces [readability-braces-around-statements]

Suggested change
if (merged_rows == batch_size) break;
if (merged_rows == batch_size) { break;
}

Comment on lines +31 to +32
namespace doris {
namespace vectorized {
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: nested namespaces can be concatenated [modernize-concat-nested-namespaces]

Suggested change
namespace doris {
namespace vectorized {
namespace doris::vectorized {

be/src/vec/runtime/vsorted_run_merger.cpp:33:

- } // namespace vectorized
- } // namespace doris
+ } // namespace doris

Comment on lines +33 to +35
namespace doris {

namespace vectorized {
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: nested namespaces can be concatenated [modernize-concat-nested-namespaces]

Suggested change
namespace doris {
namespace vectorized {
namespace doris::vectorized {

be/src/vec/runtime/vsorted_run_merger.h:107:

- } // namespace vectorized
- } // namespace doris
+ } // namespace doris

@yiguolei yiguolei merged commit 1768169 into branch-2.1 Aug 31, 2024
Gabriel39 added a commit to Gabriel39/incubator-doris that referenced this pull request Sep 2, 2024
@dataroaring dataroaring deleted the revert-39956-pick_0827 branch January 19, 2025 09:13
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.

3 participants