Rename "archive" into "persist"

CMakeLists.txt

@@ -37,7 +37,7 @@ option(ENABLE_GUILE "enable building guile module" off)
 option(ENABLE_BOOST_COROUTINE "run benchmarks with boost coroutine" off)
 
 option(immer_BUILD_TESTS "Build tests" ON)
-option(immer_BUILD_ARCHIVE_TESTS "Build experimental archive tests" off)
+option(immer_BUILD_PERSIST_TESTS "Build experimental persist tests" off)
 option(immer_BUILD_EXAMPLES "Build examples" ON)
 option(immer_BUILD_DOCS "Build docs" ON)
 option(immer_BUILD_EXTRAS "Build extras" ON)

extra/fuzzer/CMakeLists.txt

@@ -14,7 +14,7 @@ endif()
 
 file(GLOB_RECURSE immer_fuzzers "*.cpp")
 foreach(TMP_PATH ${immer_fuzzers})
-  string(FIND ${TMP_PATH} archive EXCLUDE_DIR_FOUND)
+  string(FIND ${TMP_PATH} persist EXCLUDE_DIR_FOUND)
   if(NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
     list(REMOVE_ITEM immer_fuzzers ${TMP_PATH})
   endif()
@@ -36,6 +36,6 @@ foreach(_file IN LISTS immer_fuzzers)
   endif()
 endforeach()
 
-if(immer_BUILD_ARCHIVE_TESTS)
-  add_subdirectory(archive)
+if(immer_BUILD_PERSIST_TESTS)
+  add_subdirectory(persist)
 endif()

extra/fuzzer/archive/flex-vector.cpp → extra/fuzzer/persist/flex-vector.cpp

@@ -12,8 +12,8 @@
 #include <immer/flex_vector.hpp>
 
 #include <fmt/ranges.h>
-#include <immer/extra/archive/rbts/load.hpp>
-#include <immer/extra/archive/rbts/save.hpp>
+#include <immer/extra/persist/rbts/load.hpp>
+#include <immer/extra/persist/rbts/save.hpp>
 
 #include <array>
 
@@ -38,13 +38,12 @@ extern "C" int LLVMFuzzerTestOneInput(const std::uint8_t* data,
     using size_t = std::uint8_t;
 
     const auto check_save_and_load = [&](const auto& vec) {
-        auto ar        = immer::archive::rbts::make_save_archive_for(vec);
-        auto vector_id = immer::archive::container_id{};
-        std::tie(ar, vector_id) =
-            immer::archive::rbts::save_to_archive(vec, ar);
+        auto ar        = immer::persist::rbts::make_input_pool_for(vec);
+        auto vector_id = immer::persist::container_id{};
+        std::tie(ar, vector_id) = immer::persist::rbts::add_to_pool(vec, ar);
 
         auto loader =
-            immer::archive::rbts::make_loader_for(vec, to_load_archive(ar));
+            immer::persist::rbts::make_loader_for(vec, to_output_pool(ar));
         auto loaded = loader.load(vector_id);
         require_eq(vec, loaded);
     };

extra/fuzzer/archive/fuzz-set.cpp → extra/fuzzer/persist/fuzz-set.cpp

@@ -1,6 +1,6 @@
 #include <fuzzer/fuzzer_input.hpp>
 
-#include <immer/extra/archive/champ/champ.hpp>
+#include <immer/extra/persist/champ/champ.hpp>
 
 #include <array>
 #include <bitset>
@@ -77,21 +77,20 @@ extern "C" int LLVMFuzzerTestOneInput(const std::uint8_t* data,
         case op_check: {
             const auto bitset = std::bitset<var_count>(read<size_t>(in));
             auto ids =
-                std::vector<std::pair<std::size_t, immer::archive::node_id>>{};
-            auto archive =
-                immer::archive::champ::container_archive_save<set_t>{};
+                std::vector<std::pair<std::size_t, immer::persist::node_id>>{};
+            auto archive = immer::persist::champ::container_input_pool<set_t>{};
             for (auto index = std::size_t{}; index < var_count; ++index) {
                 if (bitset[index]) {
-                    auto set_id = immer::archive::node_id{};
+                    auto set_id = immer::persist::node_id{};
                     std::tie(archive, set_id) =
-                        immer::archive::champ::save_to_archive(vars[index],
-                                                               archive);
+                        immer::persist::champ::add_to_pool(vars[index],
+                                                           archive);
                     ids.emplace_back(index, set_id);
                 }
             }
 
-            auto loader = immer::archive::champ::container_loader<set_t>{
-                to_load_archive(archive)};
+            auto loader = immer::persist::champ::container_loader<set_t>{
+                to_output_pool(archive)};
 
             for (const auto& [index, set_id] : ids) {
                 const auto& set   = vars[index];

flake.nix

@@ -48,7 +48,7 @@
 
       arximboldi-cereal = pkgs.callPackage ./nix/cereal.nix {inherit arximboldi-cereal-src;};
 
-      archive-inputs = with pkgs; [
+      persist-inputs = with pkgs; [
         spdlog
         arximboldi-cereal
         xxHash
@@ -79,8 +79,8 @@
             checkPhase = ''
               ctest -D ExperimentalMemCheck
               valgrind --quiet --error-exitcode=99 --leak-check=full --errors-for-leak-kinds=all \
-                --suppressions=./test/extra/archive/valgrind.supp \
-                ./test/extra/archive/archive-tests
+                --suppressions=./test/extra/persist/valgrind.supp \
+                ./test/extra/persist/persist-tests
             '';
           });
         };
@@ -103,7 +103,7 @@
             fzf
             starship
           ]
-          ++ archive-inputs;
+          ++ persist-inputs;
 
         shellHook =
           self.checks.${system}.pre-commit-check.shellHook
@@ -147,7 +147,7 @@
 
         unit-tests = (withLLVM self.packages.${system}.immer).overrideAttrs (prev: {
           name = "immer-unit-tests";
-          buildInputs = with pkgs; [catch2_3 boehmgc boost fmt] ++ archive-inputs;
+          buildInputs = with pkgs; [catch2_3 boehmgc boost fmt] ++ persist-inputs;
           nativeBuildInputs = with pkgs; [cmake ninja];
           dontBuild = false;
           doCheck = true;
@@ -159,7 +159,7 @@
           cmakeFlags = [
             "-DCMAKE_BUILD_TYPE=Debug"
             "-Dimmer_BUILD_TESTS=ON"
-            "-Dimmer_BUILD_ARCHIVE_TESTS=ON"
+            "-Dimmer_BUILD_PERSIST_TESTS=ON"
             "-Dimmer_BUILD_EXAMPLES=OFF"
             "-DCXX_STANDARD=20"
           ];