Fix get_database_size on Windows #9663
Open
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
|
Worth noting: I think there are build system PRs in queue which would upgrade the relevant components to make std::filesystem available everywhere; however, linking the stdc++fs library properly across environments poses its own challenges, so I don't think the change from boost to std will be a simple find/replace. |
tobtoht
approved these changes
Jan 2, 2025
jeffro256
reviewed
Jan 5, 2025
src/blockchain_db/lmdb/db_lmdb.cpp
Outdated
| if (!epee::file_io_utils::get_file_size(datafile.string(), size)) | ||
| size = 0; | ||
| return size; | ||
| datafile /= boost::filesystem::path(CRYPTONOTE_BLOCKCHAINDATA_FILENAME); |
There was a problem hiding this comment.
This conversion before appending isn't needed and is harder to read
jeffro256
reviewed
Jan 5, 2025
src/common/download.cpp
Outdated
| uint64_t existing_size = 0; | ||
| if (epee::file_io_utils::get_file_size(control->path, existing_size) && existing_size > 0) | ||
| boost::system::error_code ec{}; | ||
| uint64_t existing_size = static_cast<uint64_t>(boost::filesystem::file_size(boost::filesystem::path(control->path), ec)); |
Replace all calls to epee::file_io::get_file_size with boost::filesystem::file_size in order to avoid lossy conversions from paths to strings, which tend to break filename resolution. This commit fixes a bug on Windows where the get_info RPC call reported a zero database size because BlockchainLMBD::get_database_size returned zero.
iamamyth
force-pushed
the
db-size-win32-boost
branch
from
0f078fd to
978f1d7
Compare
jeffro256
approved these changes
Jan 6, 2025
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.
Replace all calls to epee::file_io::get_file_size with boost::filesystem::file_size in order to avoid lossy conversions from paths to strings, which tend to break filename resolution. This commit fixes a bug on Windows where the get_info RPC call reported a zero database size because BlockchainLMBD::get_database_size returned zero.