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

[BugFix] fix potential NPE in merge_path late materialize #53461

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[BugFix] fix potential NPE in merge_path late materialize #53461

wants to merge 2 commits into from
+14 −1

Conversation

murphyatwork
Copy link
Contributor

@murphyatwork murphyatwork commented Dec 3, 2024 •
edited
Loading

Why I'm doing:

What I'm doing:

  1. get_original_pair returns a reference, it's stable if the element is erased from the hashmap
  2. if get_orginal_pair returns a nullptr ChunkPtr, need to check the pointer

Fixes #issue

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

Bugfix cherry-pick branch check:

  • I have checked the version labels which the pr will be auto-backported to the target branch
    • 3.4
    • 3.3
    • 3.2
    • 3.1
    • 3.0

@murphyatwork murphyatwork requested a review from a team as a code owner December 3, 2024 03:44
LiShuMing
LiShuMing previously approved these changes Dec 3, 2024
View reviewed changes
stdpain
stdpain previously approved these changes Dec 3, 2024
View reviewed changes
@murphyatwork murphyatwork marked this pull request as draft December 3, 2024 06:01
@murphyatwork murphyatwork dismissed stale reviews from stdpain and LiShuMing via 53edd9d December 3, 2024 10:40
@murphyatwork murphyatwork marked this pull request as ready for review December 4, 2024 02:06
stdpain
stdpain reviewed Dec 4, 2024
View reviewed changes
be/src/exec/sorting/merge_path.cpp Outdated
for (int64_t ordinal : ordinals) {
// The first (64 - OFFSET_BITS) bits are used for chunk_id
// The last OFFSET_BITS bits are used for offset in chunk
const auto chunk_id = static_cast<size_t>(ordinal) >> OFFSET_BITS;
const auto row = static_cast<size_t>(ordinal) & MAX_CHUNK_SIZE;
if (prev_chunk_id == -1) {
auto& pair = get_original_pair(chunk_id);
auto pair = get_original_pair(chunk_id);
Copy link
Contributor

Choose a reason for hiding this comment

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

auto& pair

@murphyatwork murphyatwork force-pushed the murphy_fix_merge_path branch from 53edd9d to f424664 Compare December 5, 2024 11:55
@murphyatwork murphyatwork changed the title [BugFix] fix potential NPE in late materialize [BugFix] fix potential NPE in merge_path late materialize Dec 5, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 5, 2024

[Java-Extensions Incremental Coverage Report]

✅ pass : 0 / 0 (0%)

@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 5, 2024

[FE Incremental Coverage Report]

✅ pass : 0 / 0 (0%)

@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 5, 2024

[BE Incremental Coverage Report]

❌ fail : 5 / 8 (62.50%)

file detail

path covered_line new_line coverage not_covered_line_detail
🔵 be/src/exec/sorting/merge_path.cpp 5 8 62.50% [1212, 1235, 1263]

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stdpain stdpain stdpain left review comments

@LiShuMing LiShuMing LiShuMing left review comments

At least 2 approving reviews are required to merge this pull request.

Assignees

@murphyatwork murphyatwork

Labels
3.2 3.3 3.4
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@murphyatwork @LiShuMing @stdpain