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] Acquire rowsets at querying (backport #13830) #13866

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 22, 2022

This is an automatic backport of pull request #13830 done by Mergify.
Cherry-pick of c0a1b94 has failed:

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

You are currently cherry-picking commit c0a1b94c8.
  (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/exec/vectorized/olap_scan_node.cpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   be/src/exec/pipeline/scan/olap_scan_context.cpp
	deleted by us:   be/src/exec/pipeline/scan/olap_scan_context.h
	deleted by us:   be/src/exec/pipeline/scan/olap_scan_prepare_operator.cpp
	deleted by us:   be/src/exec/pipeline/scan/olap_scan_prepare_operator.h

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit c0a1b94)

# Conflicts:
#	be/src/exec/pipeline/scan/olap_scan_context.cpp
#	be/src/exec/pipeline/scan/olap_scan_context.h
#	be/src/exec/pipeline/scan/olap_scan_prepare_operator.cpp
#	be/src/exec/pipeline/scan/olap_scan_prepare_operator.h
@wanpengfei-git wanpengfei-git enabled auto-merge (rebase) November 22, 2022 16:18
auto-merge was automatically disabled January 19, 2023 06:10

Pull request was closed

@mergify mergify bot deleted the mergify/bp/branch-2.2/pr-13830 branch January 19, 2023 06: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.

None yet

3 participants