From f172a44e37df233d131e4182d0d3f35cc3e830e0 Mon Sep 17 00:00:00 2001 From: Marcus Holland-Moritz Date: Sat, 27 Jul 2024 13:50:54 +0200 Subject: [PATCH] refactor: move metadata_v2 and inode_reader_v2 to internal namespace --- CMakeLists.txt | 4 ++-- .../dwarfs/{ => internal}/inode_reader_v2.h | 4 ++++ include/dwarfs/{ => internal}/metadata_v2.h | 4 ++++ include/dwarfs/metadata_types.h | 12 ++++++---- src/dwarfs/filesystem_v2.cpp | 23 ++++++++++--------- src/dwarfs/{ => internal}/inode_reader_v2.cpp | 6 ++--- src/dwarfs/{ => internal}/metadata_v2.cpp | 6 ++--- 7 files changed, 36 insertions(+), 23 deletions(-) rename include/dwarfs/{ => internal}/inode_reader_v2.h (98%) rename include/dwarfs/{ => internal}/metadata_v2.h (99%) rename src/dwarfs/{ => internal}/inode_reader_v2.cpp (99%) rename src/dwarfs/{ => internal}/metadata_v2.cpp (99%) diff --git a/CMakeLists.txt b/CMakeLists.txt index b9732a4c..c9e025b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -633,9 +633,9 @@ list(APPEND LIBDWARFS_READER_SRC src/dwarfs/cached_block.cpp src/dwarfs/filesystem_v2.cpp src/dwarfs/fs_section.cpp - src/dwarfs/inode_reader_v2.cpp + src/dwarfs/internal/inode_reader_v2.cpp + src/dwarfs/internal/metadata_v2.cpp src/dwarfs/metadata_types.cpp - src/dwarfs/metadata_v2.cpp ) list(APPEND LIBDWARFS_WRITER_SRC diff --git a/include/dwarfs/inode_reader_v2.h b/include/dwarfs/internal/inode_reader_v2.h similarity index 98% rename from include/dwarfs/inode_reader_v2.h rename to include/dwarfs/internal/inode_reader_v2.h index e394ef35..bbfbc9a6 100644 --- a/include/dwarfs/inode_reader_v2.h +++ b/include/dwarfs/internal/inode_reader_v2.h @@ -41,6 +41,8 @@ struct inode_reader_options; struct iovec_read_buf; class performance_monitor; +namespace internal { + class inode_reader_v2 { public: inode_reader_v2() = default; @@ -101,4 +103,6 @@ class inode_reader_v2 { private: std::unique_ptr impl_; }; + +} // namespace internal } // namespace dwarfs diff --git a/include/dwarfs/metadata_v2.h b/include/dwarfs/internal/metadata_v2.h similarity index 99% rename from include/dwarfs/metadata_v2.h rename to include/dwarfs/internal/metadata_v2.h index bc5ebe0e..fce3d934 100644 --- a/include/dwarfs/metadata_v2.h +++ b/include/dwarfs/internal/metadata_v2.h @@ -51,6 +51,8 @@ namespace thrift::metadata { class metadata; } +namespace internal { + class metadata_v2 { public: metadata_v2() = default; @@ -224,4 +226,6 @@ class metadata_v2 { private: std::unique_ptr impl_; }; + +} // namespace internal } // namespace dwarfs diff --git a/include/dwarfs/metadata_types.h b/include/dwarfs/metadata_types.h index 565fbe37..9a7d9fb4 100644 --- a/include/dwarfs/metadata_types.h +++ b/include/dwarfs/metadata_types.h @@ -41,9 +41,13 @@ namespace dwarfs { +namespace internal { + template class metadata_; +} + class dir_entry_view; class logger; @@ -89,7 +93,7 @@ class inode_view ::apache::thrift::frozen::MappedFrozen; template - friend class metadata_; + friend class internal::metadata_; friend class dir_entry_view; @@ -127,7 +131,7 @@ class directory_view { ::apache::thrift::frozen::MappedFrozen; template - friend class metadata_; + friend class internal::metadata_; friend class dir_entry_view; @@ -159,7 +163,7 @@ class dir_entry_view { ::apache::thrift::frozen::View; template - friend class metadata_; + friend class internal::metadata_; public: std::string name() const; @@ -216,7 +220,7 @@ class chunk_range { ::apache::thrift::frozen::MappedFrozen; template - friend class metadata_; + friend class internal::metadata_; public: class iterator diff --git a/src/dwarfs/filesystem_v2.cpp b/src/dwarfs/filesystem_v2.cpp index 169f9c68..7b9b8496 100644 --- a/src/dwarfs/filesystem_v2.cpp +++ b/src/dwarfs/filesystem_v2.cpp @@ -43,10 +43,10 @@ #include #include #include -#include +#include +#include #include #include -#include #include #include #include @@ -357,7 +357,7 @@ get_section_data(std::shared_ptr mm, fs_section const& section, return buffer; } -metadata_v2 +internal::metadata_v2 make_metadata(logger& lgr, std::shared_ptr mm, section_map const& sections, std::vector& schema_buffer, std::vector& meta_buffer, @@ -408,11 +408,11 @@ make_metadata(logger& lgr, std::shared_ptr mm, } } - return metadata_v2(lgr, - get_section_data(mm, schema_it->second.front(), - schema_buffer, force_buffers), - meta_section_range, options, inode_offset, - force_consistency_check, perfmon); + return internal::metadata_v2(lgr, + get_section_data(mm, schema_it->second.front(), + schema_buffer, force_buffers), + meta_section_range, options, inode_offset, + force_consistency_check, perfmon); } template @@ -497,8 +497,8 @@ class filesystem_ final : public filesystem_v2::impl { LOG_PROXY_DECL(LoggerPolicy); os_access const& os_; std::shared_ptr mm_; - metadata_v2 meta_; - inode_reader_v2 ir_; + internal::metadata_v2 meta_; + internal::inode_reader_v2 ir_; mutable std::mutex mx_; std::vector meta_buffer_; std::optional> header_; @@ -662,7 +662,8 @@ filesystem_::filesystem_( cache.set_block_size(meta_.block_size()); - ir_ = inode_reader_v2(lgr, std::move(cache), options.inode_reader, perfmon); + ir_ = internal::inode_reader_v2(lgr, std::move(cache), options.inode_reader, + perfmon); if (auto it = sections.find(section_type::HISTORY); it != sections.end()) { for (auto& section : it->second) { diff --git a/src/dwarfs/inode_reader_v2.cpp b/src/dwarfs/internal/inode_reader_v2.cpp similarity index 99% rename from src/dwarfs/inode_reader_v2.cpp rename to src/dwarfs/internal/inode_reader_v2.cpp index 48d06205..c7ccc52f 100644 --- a/src/dwarfs/inode_reader_v2.cpp +++ b/src/dwarfs/internal/inode_reader_v2.cpp @@ -35,14 +35,14 @@ #include #include -#include +#include #include #include #include #include #include -namespace dwarfs { +namespace dwarfs::internal { namespace { @@ -405,4 +405,4 @@ inode_reader_v2::inode_reader_v2( logger_policies>( lgr, std::move(bc), opts, std::move(perfmon))) {} -} // namespace dwarfs +} // namespace dwarfs::internal diff --git a/src/dwarfs/metadata_v2.cpp b/src/dwarfs/internal/metadata_v2.cpp similarity index 99% rename from src/dwarfs/metadata_v2.cpp rename to src/dwarfs/internal/metadata_v2.cpp index 07ee90a9..c7d8914f 100644 --- a/src/dwarfs/metadata_v2.cpp +++ b/src/dwarfs/internal/metadata_v2.cpp @@ -48,8 +48,8 @@ #include #include #include +#include #include -#include #include #include #include @@ -61,7 +61,7 @@ #include -namespace dwarfs { +namespace dwarfs::internal { namespace fs = std::filesystem; @@ -1799,4 +1799,4 @@ metadata_v2::metadata_v2(logger& lgr, std::span schema, lgr, schema, data, options, inode_offset, force_consistency_check, std::move(perfmon))) {} -} // namespace dwarfs +} // namespace dwarfs::internal