From 620a353cdb9461d2a8a7a06ab72fd4927bb483f6 Mon Sep 17 00:00:00 2001
From: Marcus Holland-Moritz <github@mhxnet.de>
Date: Sun, 28 Jul 2024 23:57:13 +0200
Subject: [PATCH] refactor: move nilsimsa, similarity to internal namespace

---
 CMakeLists.txt                               | 4 ++--
 include/dwarfs/internal/inode.h              | 3 ++-
 include/dwarfs/internal/inode_element_view.h | 2 +-
 include/dwarfs/{ => internal}/nilsimsa.h     | 4 ++--
 include/dwarfs/{ => internal}/similarity.h   | 4 ++--
 src/dwarfs/entry.cpp                         | 1 -
 src/dwarfs/internal/inode_manager.cpp        | 4 ++--
 src/dwarfs/{ => internal}/nilsimsa.cpp       | 7 +++----
 src/dwarfs/{ => internal}/similarity.cpp     | 6 +++---
 test/multiversioning_benchmark.cpp           | 5 +++--
 10 files changed, 20 insertions(+), 20 deletions(-)
 rename include/dwarfs/{ => internal}/nilsimsa.h (95%)
 rename include/dwarfs/{ => internal}/similarity.h (95%)
 rename src/dwarfs/{ => internal}/nilsimsa.cpp (98%)
 rename src/dwarfs/{ => internal}/similarity.cpp (96%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f40ab0d..3f0f67f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -662,14 +662,14 @@ list(APPEND LIBDWARFS_WRITER_SRC
   src/dwarfs/internal/inode_manager.cpp
   src/dwarfs/internal/inode_ordering.cpp
   src/dwarfs/internal/metadata_freezer.cpp
+  src/dwarfs/internal/nilsimsa.cpp
   src/dwarfs/internal/scanner_progress.cpp
+  src/dwarfs/internal/similarity.cpp
   src/dwarfs/internal/similarity_ordering.cpp
-  src/dwarfs/nilsimsa.cpp
   src/dwarfs/progress.cpp
   src/dwarfs/scanner.cpp
   src/dwarfs/segmenter.cpp
   src/dwarfs/segmenter_factory.cpp
-  src/dwarfs/similarity.cpp
 )
 
 list(APPEND LIBDWARFS_EXTRACTOR_SRC
diff --git a/include/dwarfs/internal/inode.h b/include/dwarfs/internal/inode.h
index a5101df5..eee5b54f 100644
--- a/include/dwarfs/internal/inode.h
+++ b/include/dwarfs/internal/inode.h
@@ -29,11 +29,12 @@
 #include <vector>
 
 #include <dwarfs/inode_fragments.h>
-#include <dwarfs/nilsimsa.h>
 #include <dwarfs/object.h>
 #include <dwarfs/small_vector.h>
 #include <dwarfs/sortable_span.h>
 
+#include <dwarfs/internal/nilsimsa.h>
+
 namespace dwarfs {
 
 namespace thrift::metadata {
diff --git a/include/dwarfs/internal/inode_element_view.h b/include/dwarfs/internal/inode_element_view.h
index dd704cdd..67f2e1df 100644
--- a/include/dwarfs/internal/inode_element_view.h
+++ b/include/dwarfs/internal/inode_element_view.h
@@ -25,8 +25,8 @@
 #include <span>
 
 #include <dwarfs/fragment_category.h>
-#include <dwarfs/nilsimsa.h>
 
+#include <dwarfs/internal/nilsimsa.h>
 #include <dwarfs/internal/similarity_ordering.h>
 
 namespace dwarfs::internal {
diff --git a/include/dwarfs/nilsimsa.h b/include/dwarfs/internal/nilsimsa.h
similarity index 95%
rename from include/dwarfs/nilsimsa.h
rename to include/dwarfs/internal/nilsimsa.h
index a5908872..0459a820 100644
--- a/include/dwarfs/nilsimsa.h
+++ b/include/dwarfs/internal/nilsimsa.h
@@ -29,7 +29,7 @@
 
 #include <dwarfs/compiler.h>
 
-namespace dwarfs {
+namespace dwarfs::internal {
 
 class nilsimsa {
  public:
@@ -51,4 +51,4 @@ class nilsimsa {
   std::unique_ptr<impl> impl_;
 };
 
-} // namespace dwarfs
+} // namespace dwarfs::internal
diff --git a/include/dwarfs/similarity.h b/include/dwarfs/internal/similarity.h
similarity index 95%
rename from include/dwarfs/similarity.h
rename to include/dwarfs/internal/similarity.h
index f0f5a3c8..d97bebe4 100644
--- a/include/dwarfs/similarity.h
+++ b/include/dwarfs/internal/similarity.h
@@ -25,7 +25,7 @@
 #include <cstdint>
 #include <span>
 
-namespace dwarfs {
+namespace dwarfs::internal {
 
 class similarity {
  public:
@@ -45,4 +45,4 @@ class similarity {
   std::unique_ptr<impl> impl_;
 };
 
-} // namespace dwarfs
+} // namespace dwarfs::internal
diff --git a/src/dwarfs/entry.cpp b/src/dwarfs/entry.cpp
index 2fab2b13..5555b712 100644
--- a/src/dwarfs/entry.cpp
+++ b/src/dwarfs/entry.cpp
@@ -30,7 +30,6 @@
 #include <dwarfs/error.h>
 #include <dwarfs/file_type.h>
 #include <dwarfs/mmif.h>
-#include <dwarfs/nilsimsa.h>
 #include <dwarfs/options.h>
 #include <dwarfs/os_access.h>
 #include <dwarfs/progress.h>
diff --git a/src/dwarfs/internal/inode_manager.cpp b/src/dwarfs/internal/inode_manager.cpp
index 0ae4d58d..4ae446fe 100644
--- a/src/dwarfs/internal/inode_manager.cpp
+++ b/src/dwarfs/internal/inode_manager.cpp
@@ -47,18 +47,18 @@
 #include <dwarfs/logger.h>
 #include <dwarfs/match.h>
 #include <dwarfs/mmif.h>
-#include <dwarfs/nilsimsa.h>
 #include <dwarfs/options.h>
 #include <dwarfs/os_access.h>
 #include <dwarfs/progress.h>
 #include <dwarfs/script.h>
-#include <dwarfs/similarity.h>
 #include <dwarfs/util.h>
 
 #include <dwarfs/internal/inode_manager.h>
 #include <dwarfs/internal/inode_ordering.h>
+#include <dwarfs/internal/nilsimsa.h>
 #include <dwarfs/internal/promise_receiver.h>
 #include <dwarfs/internal/scanner_progress.h>
+#include <dwarfs/internal/similarity.h>
 #include <dwarfs/internal/similarity_ordering.h>
 #include <dwarfs/internal/worker_group.h>
 
diff --git a/src/dwarfs/nilsimsa.cpp b/src/dwarfs/internal/nilsimsa.cpp
similarity index 98%
rename from src/dwarfs/nilsimsa.cpp
rename to src/dwarfs/internal/nilsimsa.cpp
index 84663e0d..365527c3 100644
--- a/src/dwarfs/nilsimsa.cpp
+++ b/src/dwarfs/internal/nilsimsa.cpp
@@ -19,10 +19,9 @@
  * along with dwarfs.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <dwarfs/compiler.h>
-#include <dwarfs/nilsimsa.h>
+#include <dwarfs/internal/nilsimsa.h>
 
-namespace dwarfs {
+namespace dwarfs::internal {
 
 namespace {
 
@@ -187,4 +186,4 @@ void nilsimsa::update(uint8_t const* data, size_t size) {
 
 void nilsimsa::finalize(hash_type& hash) const { impl_->finalize(hash); }
 
-} // namespace dwarfs
+} // namespace dwarfs::internal
diff --git a/src/dwarfs/similarity.cpp b/src/dwarfs/internal/similarity.cpp
similarity index 96%
rename from src/dwarfs/similarity.cpp
rename to src/dwarfs/internal/similarity.cpp
index 62e094e7..55cffbac 100644
--- a/src/dwarfs/similarity.cpp
+++ b/src/dwarfs/internal/similarity.cpp
@@ -25,9 +25,9 @@
 
 #include <folly/Hash.h>
 
-#include <dwarfs/similarity.h>
+#include <dwarfs/internal/similarity.h>
 
-namespace dwarfs {
+namespace dwarfs::internal {
 
 /**
  * Simple locality sensitive hashing function
@@ -93,4 +93,4 @@ void similarity::update(uint8_t const* data, size_t size) {
 
 uint32_t similarity::finalize() const { return impl_->finalize(); }
 
-} // namespace dwarfs
+} // namespace dwarfs::internal
diff --git a/test/multiversioning_benchmark.cpp b/test/multiversioning_benchmark.cpp
index 73992493..7d6891dd 100644
--- a/test/multiversioning_benchmark.cpp
+++ b/test/multiversioning_benchmark.cpp
@@ -28,7 +28,8 @@
 #include <benchmark/benchmark.h>
 
 #include <dwarfs/compiler.h>
-#include <dwarfs/nilsimsa.h>
+
+#include <dwarfs/internal/nilsimsa.h>
 
 #include "test_helpers.h"
 #include "test_strings.h"
@@ -81,7 +82,7 @@ void nilsimsa_update(::benchmark::State& state) {
   std::vector<uint8_t> data(kNumData);
   std::generate(begin(data), end(data), std::ref(rng));
 
-  dwarfs::nilsimsa s;
+  dwarfs::internal::nilsimsa s;
 
   for (auto _ : state) {
     s.update(data.data(), data.size());