remove helper-method for inner

project-tsurugi · Oct 3, 2024 · 505dc8a · 505dc8a
1 parent 8e1d4ac
commit 505dc8a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 24 deletions.
diff --git a/include/interface_destroy.h b/include/interface_destroy.h
@@ -20,7 +20,7 @@ namespace yakushima {
     if (storage::get_storages()->empty()) { return status::OK_ROOT_IS_NULL; }
     std::vector<std::tuple<std::string, tree_instance*>>
             tuple_list;
-    scan(storage::get_storages(), "", scan_endpoint::INF, "",
+    scan<tree_instance, false>(storage::get_storages(), "", scan_endpoint::INF, "",
          scan_endpoint::INF, tuple_list, nullptr, 0);
     for (auto&& elem : tuple_list) {
         base_node* root = std::get<1>(elem)->load_root_ptr();

diff --git a/include/interface_scan.h b/include/interface_scan.h
@@ -126,28 +126,6 @@ scan(tree_instance* ti, std::string_view l_key, scan_endpoint l_end,
     }
 }
 
-template<class ValueType>
-[[maybe_unused]] static status
-scan(tree_instance* ti, std::string_view l_key, scan_endpoint l_end,
-     std::string_view r_key, scan_endpoint r_end,
-     std::vector<std::tuple<std::string, ValueType*, std::size_t>>& tuple_list,
-     std::vector<std::pair<node_version64_body, node_version64*>>*
-             node_version_vec,
-     std::size_t max_size) {
-    return scan<ValueType, true>(ti, l_key, l_end, r_key, r_end, tuple_list, node_version_vec, max_size);
-}
-
-template<class ValueType>
-[[maybe_unused]] static status
-scan(tree_instance* ti, std::string_view l_key, scan_endpoint l_end,
-     std::string_view r_key, scan_endpoint r_end,
-     std::vector<std::tuple<std::string, ValueType*>>& tuple_list,
-     std::vector<std::pair<node_version64_body, node_version64*>>*
-             node_version_vec,
-     std::size_t max_size) {
-    return scan<ValueType, false>(ti, l_key, l_end, r_key, r_end, tuple_list, node_version_vec, max_size);
-}
-
 template<class ValueType, bool NeedSize = true>
 [[maybe_unused]] static status
 scan2(std::string_view storage_name, std::string_view l_key, // NOLINT

diff --git a/include/storage_impl.h b/include/storage_impl.h
@@ -88,7 +88,7 @@ status storage::list_storages(
     out.clear();
     std::vector<std::tuple<std::string, tree_instance*>>
             tuple_list;
-    scan(get_storages(), "", scan_endpoint::INF, "", scan_endpoint::INF,
+    scan<tree_instance, false>(get_storages(), "", scan_endpoint::INF, "", scan_endpoint::INF,
          tuple_list, nullptr, 0);
     if (tuple_list.empty()) { return status::WARN_NOT_EXIST; }
     out.reserve(tuple_list.size());