From 3fb6e34ca3813d5ed94a2c933069b8f0fc00c1d3 Mon Sep 17 00:00:00 2001
From: Marcus Holland-Moritz <github@mhxnet.de>
Date: Sun, 28 Jul 2024 14:44:04 +0200
Subject: [PATCH] refactor(string_table): move to internal namespace

---
 CMakeLists.txt                               |  2 +-
 include/dwarfs/internal/metadata_types.h     |  3 ++-
 include/dwarfs/{ => internal}/string_table.h |  4 ++++
 include/dwarfs/metadata_types.h              |  1 -
 src/dwarfs/internal/metadata_v2.cpp          |  2 +-
 src/dwarfs/{ => internal}/string_table.cpp   |  7 ++++---
 src/dwarfs/scanner.cpp                       |  2 +-
 test/dwarfs_benchmark.cpp                    | 17 +++++++++--------
 8 files changed, 22 insertions(+), 16 deletions(-)
 rename include/dwarfs/{ => internal}/string_table.h (98%)
 rename src/dwarfs/{ => internal}/string_table.cpp (98%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee5c86c8..624209b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -612,6 +612,7 @@ list(APPEND LIBDWARFS_COMMON_SRC
   src/dwarfs/file_type.cpp
   src/dwarfs/fstypes.cpp
   src/dwarfs/history.cpp
+  src/dwarfs/internal/string_table.cpp
   src/dwarfs/internal/worker_group.cpp
   src/dwarfs/library_dependencies.cpp
   src/dwarfs/logger.cpp
@@ -620,7 +621,6 @@ list(APPEND LIBDWARFS_COMMON_SRC
   src/dwarfs/options.cpp
   src/dwarfs/os_access_generic.cpp
   src/dwarfs/performance_monitor.cpp
-  src/dwarfs/string_table.cpp
   src/dwarfs/terminal.cpp
   src/dwarfs/thread_pool.cpp
   src/dwarfs/util.cpp
diff --git a/include/dwarfs/internal/metadata_types.h b/include/dwarfs/internal/metadata_types.h
index bc67e01f..eab1289a 100644
--- a/include/dwarfs/internal/metadata_types.h
+++ b/include/dwarfs/internal/metadata_types.h
@@ -33,7 +33,8 @@
 
 #include <dwarfs/file_stat.h>
 #include <dwarfs/file_type.h>
-#include <dwarfs/string_table.h>
+
+#include <dwarfs/internal/string_table.h>
 
 #include <dwarfs/gen-cpp2/metadata_layouts.h>
 
diff --git a/include/dwarfs/string_table.h b/include/dwarfs/internal/string_table.h
similarity index 98%
rename from include/dwarfs/string_table.h
rename to include/dwarfs/internal/string_table.h
index e6e86618..1beba9d8 100644
--- a/include/dwarfs/string_table.h
+++ b/include/dwarfs/internal/string_table.h
@@ -34,6 +34,8 @@ namespace dwarfs {
 
 class logger;
 
+namespace internal {
+
 class string_table {
  public:
   using LegacyTableView =
@@ -103,4 +105,6 @@ class string_table {
   std::unique_ptr<impl const> impl_;
 };
 
+} // namespace internal
+
 } // namespace dwarfs
diff --git a/include/dwarfs/metadata_types.h b/include/dwarfs/metadata_types.h
index 199e578f..27aaaa21 100644
--- a/include/dwarfs/metadata_types.h
+++ b/include/dwarfs/metadata_types.h
@@ -31,7 +31,6 @@
 
 #include <dwarfs/file_stat.h>
 #include <dwarfs/file_type.h>
-#include <dwarfs/string_table.h>
 
 namespace dwarfs {
 
diff --git a/src/dwarfs/internal/metadata_v2.cpp b/src/dwarfs/internal/metadata_v2.cpp
index 5711ddec..60e8dff6 100644
--- a/src/dwarfs/internal/metadata_v2.cpp
+++ b/src/dwarfs/internal/metadata_v2.cpp
@@ -52,11 +52,11 @@
 #include <dwarfs/logger.h>
 #include <dwarfs/options.h>
 #include <dwarfs/performance_monitor.h>
-#include <dwarfs/string_table.h>
 #include <dwarfs/util.h>
 #include <dwarfs/vfs_stat.h>
 
 #include <dwarfs/internal/metadata_v2.h>
+#include <dwarfs/internal/string_table.h>
 
 #include <dwarfs/gen-cpp2/metadata_layouts.h>
 #include <dwarfs/gen-cpp2/metadata_types_custom_protocol.h>
diff --git a/src/dwarfs/string_table.cpp b/src/dwarfs/internal/string_table.cpp
similarity index 98%
rename from src/dwarfs/string_table.cpp
rename to src/dwarfs/internal/string_table.cpp
index 5f31ed46..6b98f1f2 100644
--- a/src/dwarfs/string_table.cpp
+++ b/src/dwarfs/internal/string_table.cpp
@@ -28,9 +28,10 @@
 
 #include <dwarfs/error.h>
 #include <dwarfs/logger.h>
-#include <dwarfs/string_table.h>
 
-namespace dwarfs {
+#include <dwarfs/internal/string_table.h>
+
+namespace dwarfs::internal {
 
 class legacy_string_table : public string_table::impl {
  public:
@@ -307,4 +308,4 @@ string_table::pack(std::span<std::string_view const> input,
   return pack_generic(input, options);
 }
 
-} // namespace dwarfs
+} // namespace dwarfs::internal
diff --git a/src/dwarfs/scanner.cpp b/src/dwarfs/scanner.cpp
index cefaa385..c1b635c4 100644
--- a/src/dwarfs/scanner.cpp
+++ b/src/dwarfs/scanner.cpp
@@ -58,7 +58,6 @@
 #include <dwarfs/scanner.h>
 #include <dwarfs/script.h>
 #include <dwarfs/segmenter_factory.h>
-#include <dwarfs/string_table.h>
 #include <dwarfs/thread_pool.h>
 #include <dwarfs/util.h>
 #include <dwarfs/version.h>
@@ -67,6 +66,7 @@
 #include <dwarfs/internal/block_manager.h>
 #include <dwarfs/internal/global_entry_data.h>
 #include <dwarfs/internal/metadata_freezer.h>
+#include <dwarfs/internal/string_table.h>
 #include <dwarfs/internal/worker_group.h>
 
 #include <dwarfs/gen-cpp2/metadata_types.h>
diff --git a/test/dwarfs_benchmark.cpp b/test/dwarfs_benchmark.cpp
index d9f31d7e..d5176619 100644
--- a/test/dwarfs_benchmark.cpp
+++ b/test/dwarfs_benchmark.cpp
@@ -36,10 +36,11 @@
 #include <dwarfs/progress.h>
 #include <dwarfs/scanner.h>
 #include <dwarfs/segmenter_factory.h>
-#include <dwarfs/string_table.h>
 #include <dwarfs/thread_pool.h>
 #include <dwarfs/vfs_stat.h>
 
+#include <dwarfs/internal/string_table.h>
+
 #include <dwarfs/gen-cpp2/metadata_layouts.h>
 
 #include "mmap_mock.h"
@@ -139,11 +140,11 @@ std::string make_filesystem(::benchmark::State const& state) {
 }
 
 template <typename T>
-auto make_frozen_string_table(T const& strings,
-                              string_table::pack_options const& options) {
+auto make_frozen_string_table(
+    T const& strings, internal::string_table::pack_options const& options) {
   using namespace apache::thrift::frozen;
   std::string tmp;
-  auto tbl = string_table::pack(strings, options);
+  auto tbl = internal::string_table::pack(strings, options);
   freezeToString(tbl, tmp);
   return mapFrozen<thrift::metadata::string_table>(std::move(tmp));
 }
@@ -157,7 +158,7 @@ auto make_frozen_legacy_string_table(std::vector<std::string>&& strings) {
 
 void frozen_legacy_string_table_lookup(::benchmark::State& state) {
   auto data = make_frozen_legacy_string_table(test::test_string_vector());
-  string_table table(data);
+  internal::string_table table(data);
   int i = 0;
   std::string str;
 
@@ -168,10 +169,10 @@ void frozen_legacy_string_table_lookup(::benchmark::State& state) {
 
 void frozen_string_table_lookup(::benchmark::State& state) {
   auto data = make_frozen_string_table(
-      test::test_strings,
-      string_table::pack_options(state.range(0), state.range(1), true));
+      test::test_strings, internal::string_table::pack_options(
+                              state.range(0), state.range(1), true));
   test::test_logger lgr;
-  string_table table(lgr, "bench", data);
+  internal::string_table table(lgr, "bench", data);
   int i = 0;
   std::string str;