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

Update categorizer_manager interface

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2023-07-19 14:39:12 +02:00
parent d6d279fbb4
commit 62e3805b13
3 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/dwarfs/categorizer.h
View File

@ -103,9 +103,7 @@ class categorizer_job {
explicit operator bool() const { return impl_ != nullptr; } explicit operator bool() const { return impl_ != nullptr; }
bool has_multi_fragment_sequential_categorizers() const { bool best_result_found() const { return impl_->best_result_found(); }
return impl_->has_multi_fragment_sequential_categorizers();
}
class impl { class impl {
public: public:
@ -115,7 +113,7 @@ class categorizer_job {
virtual void categorize_random_access(std::span<uint8_t const> data) = 0; virtual void categorize_random_access(std::span<uint8_t const> data) = 0;
virtual void categorize_sequential(std::span<uint8_t const> data) = 0; virtual void categorize_sequential(std::span<uint8_t const> data) = 0;
virtual inode_fragments result() = 0; virtual inode_fragments result() = 0;
virtual bool has_multi_fragment_sequential_categorizers() const = 0; virtual bool best_result_found() const = 0;
}; };
private: private:

18
src/dwarfs/categorizer.cpp
View File

@ -45,7 +45,6 @@ class categorizer_manager_private : public categorizer_manager::impl {
categorizers() const = 0; categorizers() const = 0;
virtual fragment_category::value_type virtual fragment_category::value_type
category(std::string_view cat) const = 0; category(std::string_view cat) const = 0;
virtual bool has_multi_fragment_sequential_categorizers() const = 0;
}; };
template <typename LoggerPolicy> template <typename LoggerPolicy>
@ -63,7 +62,7 @@ class categorizer_job_ final : public categorizer_job::impl {
void categorize_random_access(std::span<uint8_t const> data) override; void categorize_random_access(std::span<uint8_t const> data) override;
void categorize_sequential(std::span<uint8_t const> data) override; void categorize_sequential(std::span<uint8_t const> data) override;
inode_fragments result() override; inode_fragments result() override;
bool has_multi_fragment_sequential_categorizers() const override; bool best_result_found() const override;
private: private:
LOG_PROXY_DECL(LoggerPolicy); LOG_PROXY_DECL(LoggerPolicy);
@ -157,9 +156,8 @@ inode_fragments categorizer_job_<LoggerPolicy>::result() {
} }
template <typename LoggerPolicy> template <typename LoggerPolicy>
bool categorizer_job_< bool categorizer_job_<LoggerPolicy>::best_result_found() const {
LoggerPolicy>::has_multi_fragment_sequential_categorizers() const { return is_global_best_;
return mgr_.has_multi_fragment_sequential_categorizers();
} }
categorizer_job::categorizer_job() = default; categorizer_job::categorizer_job() = default;
@ -192,10 +190,6 @@ class categorizer_manager_ final : public categorizer_manager_private {
return it->second; return it->second;
} }
bool has_multi_fragment_sequential_categorizers() const override {
return has_multi_fragment_sequential_categorizers_;
}
private: private:
void add_category(std::string_view cat, size_t categorizer_index) { void add_category(std::string_view cat, size_t categorizer_index) {
if (catmap_.emplace(cat, categories_.size()).second) { if (catmap_.emplace(cat, categories_.size()).second) {
@ -210,7 +204,6 @@ class categorizer_manager_ final : public categorizer_manager_private {
std::vector<std::shared_ptr<categorizer const>> categorizers_; std::vector<std::shared_ptr<categorizer const>> categorizers_;
std::vector<std::pair<std::string_view, size_t>> categories_; std::vector<std::pair<std::string_view, size_t>> categories_;
std::unordered_map<std::string_view, fragment_category::value_type> catmap_; std::unordered_map<std::string_view, fragment_category::value_type> catmap_;
bool has_multi_fragment_sequential_categorizers_{false};
}; };
template <typename LoggerPolicy> template <typename LoggerPolicy>
@ -220,11 +213,6 @@ void categorizer_manager_<LoggerPolicy>::add(
add_category(c, categorizers_.size()); add_category(c, categorizers_.size());
} }
if (!c->is_single_fragment() &&
dynamic_cast<sequential_categorizer const*>(c.get())) {
has_multi_fragment_sequential_categorizers_ = true;
}
categorizers_.emplace_back(std::move(c)); categorizers_.emplace_back(std::move(c));
} }

4
src/dwarfs/inode_manager.cpp
View File

@ -155,10 +155,6 @@ class inode_ : public inode {
if (mm) { if (mm) {
if (catjob) { if (catjob) {
DWARFS_CHECK(
!catjob.has_multi_fragment_sequential_categorizers(),
"multi-fragment sequential categorizers are not supported");
catjob.set_total_size(mm->size()); catjob.set_total_size(mm->size());
catjob.categorize_random_access(mm->span()); catjob.categorize_random_access(mm->span());
} }