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

feat(dwarfsck): show categories in metadata output

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2023-12-04 11:52:48 +01:00
parent 20f8ca51a3
commit f4d918dd73
3 changed files with 49 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/dwarfs/fstypes.h
View File

@ -24,7 +24,9 @@
#include <cstddef>
#include <cstdint>
#include <iosfwd>
#include <optional>
#include <string>
#include <vector>
#include "dwarfs/block_compressor.h" // TODO: or the other way round?
#include "dwarfs/checksum.h"
@ -90,6 +92,8 @@ struct filesystem_info {
uint64_t uncompressed_metadata_size{0};
bool uncompressed_block_size_is_estimate{false};
bool uncompressed_metadata_size_is_estimate{false};
std::vector<size_t> compressed_block_sizes;
std::vector<std::optional<size_t>> uncompressed_block_sizes;
};
bool is_known_compression_type(compression_type type);

11
src/dwarfs/filesystem_v2.cpp
View File

@ -443,19 +443,22 @@ filesystem_info const& filesystem_<LoggerPolicy>::get_info() const {
if (s->type() == section_type::BLOCK) {
++info.block_count;
info.compressed_block_size += s->length();
info.compressed_block_sizes.push_back(s->length());
try {
info.uncompressed_block_size +=
get_uncompressed_section_size(mm_, *s);
} catch (std::exception const& e) {
auto uncompressed_size = get_uncompressed_section_size(mm_, *s);
info.uncompressed_block_size += uncompressed_size;
info.uncompressed_block_sizes.push_back(uncompressed_size);
} catch (std::exception const&) {
info.uncompressed_block_size += s->length();
info.uncompressed_block_size_is_estimate = true;
info.uncompressed_block_sizes.push_back(std::nullopt);
}
} else if (s->type() == section_type::METADATA_V2) {
info.compressed_metadata_size += s->length();
try {
info.uncompressed_metadata_size +=
get_uncompressed_section_size(mm_, *s);
} catch (std::exception const& e) {
} catch (std::exception const&) {
info.uncompressed_metadata_size += s->length();
info.uncompressed_metadata_size_is_estimate = true;
}

38
src/dwarfs/metadata_v2.cpp
View File

@ -37,6 +37,7 @@
#include <fmt/format.h>
#include <folly/container/Enumerate.h>
#include <folly/container/F14Set.h>
#include <folly/portability/Stdlib.h>
#include <folly/portability/Unistd.h>
@ -990,6 +991,43 @@ void metadata_<LoggerPolicy>::dump(
}
}
if (meta_.block_categories()) {
auto const& catnames = *meta_.category_names();
struct category_info {
size_t count{0};
size_t compressed_size{0};
size_t uncompressed_size{0};
bool uncompressed_size_is_estimate{false};
};
std::map<size_t, category_info> catinfo;
for (auto [block, category] : folly::enumerate(*meta_.block_categories())) {
auto& ci = catinfo[category];
++ci.count;
ci.compressed_size += fsinfo.compressed_block_sizes.at(block);
if (auto size = fsinfo.uncompressed_block_sizes.at(block)) {
ci.uncompressed_size += *size;
} else {
ci.uncompressed_size_is_estimate = true;
}
}
os << "categories:\n";
for (auto const& [category, ci] : catinfo) {
os << " " << catnames[category] << ": " << ci.count << " blocks";
if (ci.uncompressed_size_is_estimate ||
ci.uncompressed_size != ci.compressed_size) {
os << ", " << size_with_unit(ci.compressed_size) << " compressed";
}
if (!ci.uncompressed_size_is_estimate) {
os << ", " << size_with_unit(ci.uncompressed_size) << " uncompressed";
if (ci.uncompressed_size != ci.compressed_size) {
os << fmt::format(" ({0:.2f}%)", (100.0 * ci.compressed_size) /
ci.uncompressed_size);
}
}
os << "\n";
}
}
if (detail_level > 1) {
analyze_frozen(os, meta_, data_.size(), detail_level);
}