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

[Enhancement] Add ColumnAndPredicate (backport #53635) #54875

Merged
merged 2 commits into from
Jan 10, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 9, 2025

Why I'm doing:

Later storage engine will dynamic transfer runtime filter(min=5, max=10, has_null) to (xxx>=5 and xxx<10) or (xxx has null) , so i need support ColumnAndPredicate first.

What I'm doing:

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: trueeyu <[email protected]>
(cherry picked from commit 13ddfe2)

# Conflicts:
#	be/src/storage/column_in_predicate.cpp
#	be/test/CMakeLists.txt
@mergify mergify bot added the conflicts label Jan 9, 2025
Copy link
Contributor Author

mergify bot commented Jan 9, 2025

Cherry-pick of 13ddfe2 has failed:

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

You are currently cherry-picking commit 13ddfe2d17.
  (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/exprs/min_max_predicate.h
	modified:   be/src/storage/CMakeLists.txt
	new file:   be/src/storage/column_and_predicate.cpp
	new file:   be/src/storage/column_and_predicate.h
	modified:   be/src/storage/column_expr_predicate.h
	modified:   be/src/storage/column_not_in_predicate.cpp
	modified:   be/src/storage/column_null_predicate.cpp
	modified:   be/src/storage/column_or_predicate.cpp
	modified:   be/src/storage/column_or_predicate.h
	new file:   be/test/storage/column_and_predicate_test.cpp
	new file:   be/test/storage/column_or_predicate_test.cpp
	modified:   be/test/storage/column_predicate_test.cpp

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

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

Copy link
Contributor Author

mergify bot commented Jan 9, 2025

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

@mergify mergify bot closed this Jan 9, 2025
@trueeyu trueeyu reopened this Jan 10, 2025
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) January 10, 2025 02:23
Signed-off-by: trueeyu <[email protected]>
@wanpengfei-git wanpengfei-git merged commit 93f7c9b into branch-3.3 Jan 10, 2025
26 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.3/pr-53635 branch January 10, 2025 02:52
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