TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-12 13:59:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor: switch from folly::gen to ranges

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2024-07-27 15:50:50 +02:00
parent 3ce99d6a43
commit 433bb5e46a
3 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/dwarfs/block_compressor.cpp
View File

@ -23,8 +23,7 @@
#include <cassert> #include <cassert>
#include <cstdint> #include <cstdint>
#include <iostream> #include <iostream>
#include <ranges>
#include <folly/gen/Base.h>
#include <dwarfs/block_compressor.h> #include <dwarfs/block_compressor.h>
#include <dwarfs/error.h> #include <dwarfs/error.h>
@ -104,10 +103,14 @@ compression_registry::make_decompressor(compression_type type,
void compression_registry::for_each_algorithm( void compression_registry::for_each_algorithm(
std::function<void(compression_type, compression_info const&)> const& fn) std::function<void(compression_type, compression_info const&)> const& fn)
const { const {
using namespace folly::gen; auto view = std::views::keys(factories_);
std::vector<compression_type> types{view.begin(), view.end()};
from(factories_) | get<0>() | order | std::ranges::sort(types);
[this, &fn](compression_type type) { fn(type, *factories_.at(type)); };
for (auto type : types) {
fn(type, *factories_.at(type));
}
} }
compression_registry::compression_registry() = default; compression_registry::compression_registry() = default;

22
src/dwarfs/internal/global_entry_data.cpp
View File

@ -19,7 +19,7 @@
* along with dwarfs. If not, see <https://www.gnu.org/licenses/>. * along with dwarfs. If not, see <https://www.gnu.org/licenses/>.
*/ */
#include <folly/gen/Base.h> #include <ranges>
#include <dwarfs/error.h> #include <dwarfs/error.h>
#include <dwarfs/internal/global_entry_data.h> #include <dwarfs/internal/global_entry_data.h>
@ -29,10 +29,12 @@ namespace dwarfs::internal {
template <typename T, typename U> template <typename T, typename U>
std::vector<T> global_entry_data::get_vector(map_type<T, U> const& map) const { std::vector<T> global_entry_data::get_vector(map_type<T, U> const& map) const {
using namespace folly::gen; std::vector<std::pair<T, U>> pairs{map.begin(), map.end()};
std::vector<std::pair<T, U>> pairs(map.begin(), map.end()); std::ranges::sort(pairs, [](auto const& p1, auto const& p2) {
return from(pairs) | orderBy([](auto const& p) { return p.second; }) | return p1.second < p2.second;
get<0>() | as<std::vector>(); });
auto view = std::views::keys(pairs);
return std::vector<T>{view.begin(), view.end()};
} }
auto global_entry_data::get_uids() const -> std::vector<uid_type> { auto global_entry_data::get_uids() const -> std::vector<uid_type> {
@ -58,9 +60,13 @@ auto global_entry_data::get_symlinks() const -> std::vector<std::string> {
} }
void global_entry_data::index(map_type<std::string, uint32_t>& map) { void global_entry_data::index(map_type<std::string, uint32_t>& map) {
using namespace folly::gen; auto keys = std::views::all(map) | std::views::keys;
uint32_t ix = 0; std::vector<std::string_view> tmp{keys.begin(), keys.end()};
from(map) | get<0>() | order | [&](std::string const& s) { map[s] = ix++; }; std::ranges::sort(tmp);
std::decay_t<decltype(map)>::mapped_type ix{0};
for (auto& s : tmp) {
map[s] = ix++;
}
} }
uint64_t global_entry_data::get_time_offset(uint64_t time) const { uint64_t global_entry_data::get_time_offset(uint64_t time) const {

6
src/mkdwarfs_main.cpp
View File

@ -410,15 +410,15 @@ int mkdwarfs_main(int argc, sys_char** argv, iolayer const& iol) {
auto order_desc = "inode fragments order (" + order_parser.choices() + ")"; auto order_desc = "inode fragments order (" + order_parser.choices() + ")";
auto progress_desc = fmt::format( auto progress_desc = fmt::format(
"progress mode ({})", fmt::join(progress_modes | std::views::keys, ", ")); "progress mode ({})", fmt::join(std::views::keys(progress_modes), ", "));
auto debug_filter_desc = auto debug_filter_desc =
fmt::format("show effect of filter rules without producing an image ({})", fmt::format("show effect of filter rules without producing an image ({})",
fmt::join(debug_filter_modes | std::views::keys, ", ")); fmt::join(std::views::keys(debug_filter_modes), ", "));
auto resolution_desc = auto resolution_desc =
fmt::format("time resolution in seconds or ({})", fmt::format("time resolution in seconds or ({})",
fmt::join(time_resolutions | std::views::keys, ", ")); fmt::join(std::views::keys(time_resolutions), ", "));
auto hash_list = checksum::available_algorithms(); auto hash_list = checksum::available_algorithms();