Refactor block file logic + util.h/cpp moved to util/system.h #2336
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
furszy
changed the title
furszy
force-pushed
the
2021_refactor_block_file_logic
branch
from
c121a5f
to
5629d03
Compare
furszy
force-pushed
the
2021_refactor_block_file_logic
branch
from
5629d03
to
9529162
Compare
furszy
changed the title
furszy
changed the title
furszy
changed the title
|
Rebased after #2326 merge, ready to go. |
furszy
force-pushed
the
2021_refactor_block_file_logic
branch
from
9529162
to
894890a
Compare
|
rebased on master so this work gets more test coverage. |
furszy
force-pushed
the
2021_refactor_block_file_logic
branch
2 times, most recently
from
3a901d6
to
c4a798c
Compare
furszy
force-pushed
the
2021_refactor_block_file_logic
branch
2 times, most recently
from
b9ec374
to
2e35dea
Compare
|
rebased due conflicts with a recently merged PR, ready to go. |
furszy
force-pushed
the
2021_refactor_block_file_logic
branch
from
2e35dea
to
b1a4b50
Compare
|
rebased. |
random-zebra
previously approved these changes
May 14, 2021
Fuzzbawls
previously approved these changes
May 15, 2021
src/validation.cpp
Outdated
| } else | ||
| return state.Error("out of disk space"); | ||
| bool out_of_space; | ||
| size_t bytes_allocated = BlockFileSeq().Allocate(pos, nAddSize, out_of_space); |
There was a problem hiding this comment.
bytes_allocated is never used, because we don't have block pruning yet. This introduces a compiler warning that can be squelched by simply re-writing the line as follows until block pruning is introduced.
/*size_t bytes_allocated = */BlockFileSeq().Allocate(pos, nAddSize, out_of_space);
src/validation.cpp
Outdated
| } else | ||
| return state.Error("out of disk space"); | ||
| bool out_of_space; | ||
| size_t bytes_allocated = UndoFileSeq().Allocate(pos, nAddSize, out_of_space); |
There was a problem hiding this comment.
same as above
/*size_t bytes_allocated = */UndoFileSeq().Allocate(pos, nAddSize, out_of_space);-BEGIN VERIFY SCRIPT- sed -i 's/CDiskBlockPos/FlatFilePos/g' $(git ls-files 'src/*.h' 'src/*.cpp') -END VERIFY SCRIPT-
furszy
force-pushed
the
2021_refactor_block_file_logic
branch
from
b1a4b50
to
3e48fc1
Compare
|
Merging.. |
This was referenced May 15, 2021
furszy
added a commit
that referenced
this pull request
May 18, 2021
…r_basic_data 23d31db [BUG][Tests] Properly set temporary datadir for dbwrapper_basic_data (random-zebra) Pull request description: Few cases left out in #2336 ACKs for top commit: Fuzzbawls: ACK 23d31db furszy: ACK 23d31db and merging Tree-SHA512: fac4fdd14b028520a473b234faac9e9472869ff1e97948c31af126554bc959ef6b920979e62036bb61189728635801367dc1fe35c8fdac828633fe95bc38d073
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.
This is part of the block logic refactoring and encapsulation work coming from upstream (work started in #2326 and #2328 due the possible blocks db corruption issue).
Needed for two future works: (1) faster block validation using a new cache structure and (2) the future possible custom BIP157 (new sync protocol that supersedes BIP37 for light clients -- pending research needed after finishing v6.0 priorities --)
Essentially, it's encapsulating the sequenced files open/read/write functionalities inside a new
flatfilemodule, and extending the unit test coverage to validate its correct behavior.Adapted the following PRs:
util.h/cppfiles mv toutil/system.h&util/system.cpp.