Dedup IsFileSectorAligned() to fix unity build. #5812
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Summary: Unity build fails because of name conflict of IsFileSectorAligned() after recent refactoring. Consolidate the function. Test Plan: make unity. At least the failure goes away. Also "make all", "make release" and see no regression in normal cases.
ltamasi
approved these changes
Sep 16, 2019
file/read_write_util.h
Outdated
| @@ -26,4 +26,9 @@ extern Status NewWritableFile(Env* env, const std::string& fname, | |||
| bool ReadOneLine(std::istringstream* iss, SequentialFile* seq_file, | |||
| std::string* output, bool* has_data, Status* result); | |||
|
|
|||
| #ifndef NDEBUG | |||
| bool IsFileSectorAligned(const size_t off, size_t sector_size) { | |||
There was a problem hiding this comment.
I think we should mark this inline if we're going to put the implementation in the header file (alternatively, the definition could be moved to the .cc).
There was a problem hiding this comment.
Yes, I noticed it too. I moved it to .cc file now.
| @@ -15,15 +15,6 @@ | |||
| #include "util/rate_limiter.h" | |||
|
|
|||
| namespace rocksdb { | |||
|
|
|||
There was a problem hiding this comment.
#include "file/read_write_util.h" in this file as well?
There was a problem hiding this comment.
@siying has imported this pull request. If you are a Facebook employee, you can view this diff on Phabricator.
|
This pull request has been merged in 811e403. |
merryChris
pushed a commit
to merryChris/rocksdb
that referenced
this pull request
Nov 18, 2019
Summary: Unity build fails because of name conflict of IsFileSectorAligned() after recent refactoring. Consolidate the function. Pull Request resolved: facebook#5812 Test Plan: make unity. At least the failure goes away. Also "make all", "make release" and see no regression in normal cases. Differential Revision: D17411403 fbshipit-source-id: 09d5653471ae2c3a4d898e120a024f7dd08d9c9d
levichen94
pushed a commit
to bytedance/terarkdb
that referenced
this pull request
Jun 18, 2021
Summary: Unity build fails because of name conflict of IsFileSectorAligned() after recent refactoring. Consolidate the function. Pull Request resolved: facebook/rocksdb#5812 Test Plan: make unity. At least the failure goes away. Also "make all", "make release" and see no regression in normal cases. Differential Revision: D17411403 fbshipit-source-id: 09d5653471ae2c3a4d898e120a024f7dd08d9c9d Signed-off-by: Changlong Chen <levisonchen@live.cn>
mm304321141
pushed a commit
to bytedance/terarkdb
that referenced
this pull request
Jun 23, 2021
Summary: Unity build fails because of name conflict of IsFileSectorAligned() after recent refactoring. Consolidate the function. Pull Request resolved: facebook/rocksdb#5812 Test Plan: make unity. At least the failure goes away. Also "make all", "make release" and see no regression in normal cases. Differential Revision: D17411403 fbshipit-source-id: 09d5653471ae2c3a4d898e120a024f7dd08d9c9d Signed-off-by: Changlong Chen <levisonchen@live.cn>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary:
Unity build fails because of name conflict of IsFileSectorAligned() after recent refactoring. Consolidate the function.
Test Plan: make unity. At least the failure goes away. Also "make all", "make release" and see no regression in normal cases.