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] do flush before error check in BinaryOutputArchive (backport #48074) #48120

Merged
merged 2 commits into from
Jul 10, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 10, 2024

Why I'm doing:

What I'm doing:

We add check in PR #48045 to BinaryOutputArchive, however, there are several shortcomings:

  1. !fail() is better than using good(), because it won't check error like eof.
  2. Explicit flush() should be called before state checking
  3. Add UT to make sure [BugFix] check if BinaryOutputArchive write success #48045 is working well.

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.3
    • 3.2
    • 3.1
    • 3.0
    • 2.5

This is an automatic backport of pull request #48074 done by [Mergify](https://mergify.com). ## Why I'm doing:

What I'm doing:

We add check in PR #48045 to BinaryOutputArchive, however, there are several shortcomings:

  1. !fail() is better than using good(), because it won't check error like eof.
  2. Explicit flush() should be called before state checking
  3. Add UT to make sure [BugFix] check if BinaryOutputArchive write success #48045 is working well.

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: luohaha <[email protected]>
(cherry picked from commit d96e6b0)

# Conflicts:
#	be/src/storage/persistent_index.cpp
#	be/src/storage/persistent_index.h
#	be/test/storage/persistent_index_test.cpp
@mergify mergify bot added the conflicts label Jul 10, 2024
Copy link
Contributor Author

mergify bot commented Jul 10, 2024

Cherry-pick of d96e6b0 has failed:

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

You are currently cherry-picking commit d96e6b052e.
  (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/util/phmap/phmap_dump.h

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   be/src/storage/persistent_index.cpp
	both modified:   be/src/storage/persistent_index.h
	both modified:   be/test/storage/persistent_index_test.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

Copy link
Contributor Author

mergify bot commented Jul 10, 2024

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

@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-48074 branch July 10, 2024 07:57
@luohaha luohaha restored the mergify/bp/branch-2.5/pr-48074 branch July 10, 2024 08:02
@luohaha luohaha reopened this Jul 10, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) July 10, 2024 08:02
Signed-off-by: Yixin Luo <[email protected]>
@wanpengfei-git wanpengfei-git merged commit 6cfe650 into branch-2.5 Jul 10, 2024
34 of 35 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-2.5/pr-48074 branch July 10, 2024 08:31
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