Clean up VersionEdit a bit #6383
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: This is a bunch of small improvements to VersionEdit. Namely, the patch * Makes the names and order of variables, methods, and code chunks related to the various information elements more consistent, and adds missing getters for the sake of completeness. * Initializes previously uninitialized stack variables. * Marks all getters const to improve const correctness. * Adds in-class initializers and removes the default ctor that would create an object with uninitialized built-in fields and call `Clear` afterwards. * Adds a new type alias for new files and changes the existing `typedef` for deleted files into a type alias as well. * Makes the helper method `DecodeNewFile4From` private. * Switches from long-winded iterator syntax to range based loops in a couple of places. * Fixes a couple of assignments where an integer 0 was assigned to boolean members. Test Plan: make check
There was a problem hiding this comment.
@ltamasi has imported this pull request. If you are a Facebook employee, you can view this diff on Phabricator.
ghost
reviewed
Feb 7, 2020
| for (DeletedFileSet::const_iterator iter = deleted_files_.begin(); | ||
| iter != deleted_files_.end(); | ||
| ++iter) { | ||
| for (const auto& deleted_file : deleted_files_) { |
There was a problem hiding this comment.
how about for (auto [level, file] : deleted_files_)?
There was a problem hiding this comment.
That's a C++17 feature; we generally use C++11 because we have to support fairly old compilers.
ghost
reviewed
Feb 7, 2020
db/version_edit.h
Outdated
| bool has_next_file_number() const { return has_next_file_number_; } | ||
| // Delete the specified "file" from the specified "level". | ||
| void DeleteFile(int level, uint64_t file) { | ||
| deleted_files_.insert({level, file}); |
There was a problem hiding this comment.
how about emplace(level, file) to construct in-place and save the copy in the initializer list?
ghost
approved these changes
Feb 7, 2020
|
@ltamasi has updated the pull request. Re-import the pull request |
There was a problem hiding this comment.
@ltamasi has imported this pull request. If you are a Facebook employee, you can view this diff on Phabricator.
ltamasi
added a commit
to ltamasi/rocksdb
that referenced
this pull request
Feb 10, 2020
Summary: facebook#6383 surfaced an issue with `VersionSet`/`ReactiveVersionSet` and `AtomicGroupReadBuffer::AddEdit` (which was added in facebook#5411): `AddEdit` moves the `VersionEdit` passed to it into `replay_buffer_`, however, the client `VersionSet` classes keep using it afterwards. This *seemed to* work before the refactoring but it really did not: since `VersionEdit` used to have a user-declared destructor, no move constructor/move assignment operator was generated, and the `move` in `AddEdit` was really a copy. The patch makes the copy explicit. Note: it should be possible to rework this logic so that we can get away with the move but for now, this should fix the issue. Test Plan: `make analyze`
facebook-github-bot
pushed a commit
that referenced
this pull request
Feb 11, 2020
Summary: #6383 surfaced an issue with `VersionSet`/`ReactiveVersionSet` and `AtomicGroupReadBuffer::AddEdit` (which was added in #5411): `AddEdit` moves the `VersionEdit` passed to it into `replay_buffer_`, however, the client `VersionSet` classes keep using it afterwards. This *seemed to* work before the refactoring but it really did not: since `VersionEdit` used to have a user-declared destructor, no move constructor/move assignment operator was generated, and the `move` in `AddEdit` was really a copy. The patch makes the copy explicit. Note: it should be possible to rework this logic so that we can get away with the move but for now, this should fix the issue. Pull Request resolved: #6400 Test Plan: `make check` `make analyze` Differential Revision: D19824466 Pulled By: ltamasi fbshipit-source-id: f38033967daf2a39c78dcd6e12978bafe37632b4
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:
This is a bunch of small improvements to
VersionEdit. Namely, the patchto the various information elements more consistent, and adds missing
getters for the sake of completeness.
create an object with uninitialized built-in fields and call
Clearafterwards.
typedeffor deleted files into a type alias as well.
DecodeNewFile4Fromprivate.couple of places.
boolean members.
Test Plan:
make check