8000 Improve util/file for Windows by fealebenpae · Pull Request #6221 · realm/realm-core · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Improve util/file for Windows #6221

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.

Sign up for GitHub

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

Merged
merged 21 commits into from
Feb 15, 2023
Merged

Improve util/file for Windows #6221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c06ccf5
Improve util/file for Windows
fealebenpae Jan 21, 2023
b8f60b4
changes
fealebenpae Jan 21, 2023
12602a9
update basic_system error tests
fealebenpae Jan 21, 2023
42e4f74
File::get_free_space now using std::filesystem
fealebenpae Jan 21, 2023
727302b
changelog
fealebenpae Jan 21, 2023
edcf7f4
fix tests
fealebenpae Jan 21, 2023
72699b6
Merge branch 'master' into yg/win32-file-uniqueid
fealebenpae Jan 23, 2023
24a832b
bring back useful comment
fealebenpae Jan 24, 2023
9c080b8
address code review comments
fealebenpae Feb 3, 2023
8c054d4
Merge branch 'yg/win32-file-uniqueid' of https://github.com/realm/rea…
fealebenpae Feb 3, 2023
07dc7de
Update src/realm/util/file.cpp
fealebenpae Feb 3, 2023
1d7d1cd
Merge branch 'master' into yg/win32-file-uniqueid
fealebenpae Feb 3, 2023
1b7af91
fix formatting
fealebenpae Feb 3, 2023
f9f62b8
fix tests
fealebenpae Feb 3, 2023
6b0bb2f
remove File::UniqueID comparison operators
fealebenpae Feb 7, 2023
e6b89cf
Revert "remove File::UniqueID comparison operators"
fealebenpae Feb 7, 2023
b247a6a
fix File::UniqueID operator< on Windows
fealebenpae Feb 7, 2023
790bc6e
Merge branch 'master' of github.com:realm/realm-core into yg/win32-fi…
fealebenpae Feb 7, 2023
9cd7102
Merge branch 'master' into yg/win32-file-uniqueid
fealebenpae Feb 9, 2023
96dc052
Merge branch 'master' of github.com:realm/realm-core into yg/win32-fi…
fealebenpae Feb 15, 2023
fb8b2e6
Apply suggestions from code review
fealebenpae Feb 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@

### Internals
* Upgrade OpenSSL from 3.0.7 to 3.0.8. ([#6305](https://github.com/realm/realm-core/pull/6305))
* Windows improvements in util/file ([PR #6221](https://github.com/realm/realm-core/pull/6221)):
* The following APIs are now implemented using std::filesystem: `try_make_dir`/`make_dir`, `make_dir_recursive`, `try_remove_dir`/`remove_dir`, `try_remove_dir_recursive`/`remove_dir_recursive`, `File::exists`, `File::is_dir`, `File::try_remove`/`File::remove`, `File::move`, `File::copy`, `File::last_write_time`, `File::get_free_space`
* `File::get_unique_id` now works on Windows
* Replaced manual path string conversion with `std::filesystem::path`

----------------------------------------------

Expand Down
6 changes: 0 additions & 6 deletions src/realm/db.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1458,13 +1458,7 @@ bool DB::compact(bool bump_version_number, util::Optional<const char*> output_en
tr->close_read_with_lock();
m_alloc.detach();

#ifdef _WIN32
// can't rename to existing file on Windows
util::File::copy(tmp_path, m_db_path);
util::File::remove(tmp_path);
#else
util::File::move(tmp_path, m_db_path);
#endif
Comment on lines -1461 to -1467
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

File::move() is now implemented in terms of std::filesystem::rename(), which does support overwriting renames on Windows.


SlabAlloc::Config cfg;
cfg.session_initiator = true;
Expand Down
Loading
0