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

[BugFix] Fix Unexpected memory copy (backport #53052) #53082

Merged
merged 2 commits into from
Nov 21, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 21, 2024

Why I'm doing:

What I'm doing:

same with #52885

grep -Rn 'get_data' be/src/|grep auto|grep =|grep -v '&'|grep -v '*'|grep -v '\['|grep -v 'ColumnHelper::get_data_column'|grep -v 'get_data_column_of_const'|grep -v '\.data\(\)'

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:

Why I'm doing:

What I'm doing:

same with #52885

grep -Rn 'get_data' be/src/|grep auto|grep =|grep -v '&'|grep -v '*'|grep -v '\['|grep -v 'ColumnHelper::get_data_column'|grep -v 'get_data_column_of_const'|grep -v '\.data\(\)'

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

Signed-off-by: stdpain <[email protected]>
(cherry picked from commit 9aeb07c)

# Conflicts:
#	be/src/storage/column_in_predicate.cpp
@mergify mergify bot added the conflicts label Nov 21, 2024
Copy link
Contributor Author

mergify bot commented Nov 21, 2024

Cherry-pick of 9aeb07c has failed:

On branch mergify/bp/branch-3.0/pr-53052
Your branch is up to date with 'origin/branch-3.0'.

You are currently cherry-picking commit 9aeb07ce0d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   be/src/column/column_helper.h
	modified:   be/src/exec/stream/aggregate/stream_aggregator.cpp
	modified:   be/src/exprs/agg/group_concat.h
	modified:   be/src/exprs/array_functions.tpp
	modified:   be/src/exprs/utility_functions.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   be/src/storage/column_in_predicate.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Nov 21, 2024
24 tasks
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) November 21, 2024 04:01
@mergify mergify bot closed this Nov 21, 2024
auto-merge was automatically disabled November 21, 2024 04:01

Pull request was closed

Copy link
Contributor Author

mergify bot commented Nov 21, 2024

@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr

@stdpain stdpain reopened this Nov 21, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) November 21, 2024 06:46
@wanpengfei-git wanpengfei-git merged commit 40d89dc into branch-3.0 Nov 21, 2024
29 of 31 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.0/pr-53052 branch November 21, 2024 07:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants