Rename MPool into solver::libsolv::Database

libmamba/CMakeLists.txt

@@ -183,9 +183,11 @@ set(
     ${LIBMAMBA_SOURCE_DIR}/solv-cpp/solvable.cpp
     ${LIBMAMBA_SOURCE_DIR}/solv-cpp/solver.cpp
     ${LIBMAMBA_SOURCE_DIR}/solv-cpp/transaction.cpp
-    # Solver interface
+    # Solver generic interface
     ${LIBMAMBA_SOURCE_DIR}/solver/helpers.cpp
     ${LIBMAMBA_SOURCE_DIR}/solver/problems_graph.cpp
+    # Solver libsolv implementation
+    ${LIBMAMBA_SOURCE_DIR}/solver/libsolv/database.cpp
     ${LIBMAMBA_SOURCE_DIR}/solver/libsolv/helpers.cpp
     ${LIBMAMBA_SOURCE_DIR}/solver/libsolv/parameters.cpp
     ${LIBMAMBA_SOURCE_DIR}/solver/libsolv/repo_info.cpp
@@ -212,6 +214,7 @@ set(
     # Core API (low-level)
     ${LIBMAMBA_SOURCE_DIR}/core/singletons.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/activation.cpp
+    ${LIBMAMBA_SOURCE_DIR}/core/package_database_loader.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/channel_context.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/context.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/download_progress_bar.cpp
@@ -224,7 +227,6 @@ set(
     ${LIBMAMBA_SOURCE_DIR}/core/output.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/package_handling.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/package_cache.cpp
-    ${LIBMAMBA_SOURCE_DIR}/core/pool.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/prefix_data.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/progress_bar.cpp
     ${LIBMAMBA_SOURCE_DIR}/core/progress_bar_impl.cpp
@@ -313,10 +315,12 @@ set(
     ${LIBMAMBA_INCLUDE_DIR}/mamba/specs/unresolved_channel.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/specs/version.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/specs/version_spec.hpp
-    # Solver Interface
+    # Solver generic interface
     ${LIBMAMBA_INCLUDE_DIR}/mamba/solver/problems_graph.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/solver/request.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/solver/solution.hpp
+    # Solver libsolv implementation
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/solver/libsolv/database.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/solver/libsolv/parameters.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/solver/libsolv/repo_info.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/solver/libsolv/solver.hpp
@@ -341,6 +345,7 @@ set(
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/context.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/download_progress_bar.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/environments_manager.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/package_database_loader.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/error_handling.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/history.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/link.hpp
@@ -351,7 +356,6 @@ set(
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/package_fetcher.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/package_handling.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/package_paths.hpp
-    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/pool.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/prefix_data.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/progress_bar.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/pinning.hpp

libmamba/include/mamba/api/channel_loader.hpp

@@ -11,15 +11,18 @@
 
 namespace mamba
 {
+    namespace solver::libsolv
+    {
+        class Database;
+    }
     class Context;
     class ChannelContext;
-    class MPool;
     class MultiPackageCache;
 
     auto load_channels(  //
         Context& ctx,
         ChannelContext& channel_context,
-        MPool& pool,
+        solver::libsolv::Database& pool,
         MultiPackageCache& package_caches
     ) -> expected_t<void, mamba_aggregated_error>;
 }

libmamba/include/mamba/api/install.hpp

@@ -7,23 +7,33 @@
 #ifndef MAMBA_API_INSTALL_HPP
 #define MAMBA_API_INSTALL_HPP
 
+#include <iosfwd>
 #include <string>
 #include <vector>
 
 #include <nlohmann/json.hpp>
 #include <yaml-cpp/yaml.h>
 
-#include "mamba/core/package_cache.hpp"
-#include "mamba/core/pool.hpp"
 #include "mamba/fs/filesystem.hpp"
 #include "mamba/solver/request.hpp"
-#include "mamba/specs/package_info.hpp"
 
 namespace mamba
 {
     class Context;
     class ChannelContext;
     class Configuration;
+    class PrefixData;
+    class MultiPackageCache;
+
+    namespace specs
+    {
+        class PackageInfo;
+    }
+
+    namespace solver::libsolv
+    {
+        class DataBase;
+    }
 
     void install(Configuration& config);
 

libmamba/include/mamba/api/repoquery.hpp

@@ -13,6 +13,11 @@
 
 namespace mamba
 {
+    namespace solver::libsolv
+    {
+        class DataBase;
+    }
+
     enum class QueryResultFormat
     {
         Json = 0,
@@ -23,7 +28,7 @@ namespace mamba
     };
 
     [[nodiscard]] auto make_repoquery(
-        MPool& pool,
+        solver::libsolv::Database& pool,
         QueryType type,
         QueryResultFormat format,
         const std::vector<std::string>& queries,

libmamba/include/mamba/core/package_database_loader.hpp

@@ -0,0 +1,39 @@
+// Copyright (c) 2019, QuantStack and Mamba Contributors
+//
+// Distributed under the terms of the BSD 3-Clause License.
+//
+// The full license is in the file LICENSE, distributed with this software.
+
+#ifndef MAMBA_CORE_PACKAGE_DATABASE_LOADER_HPP
+#define MAMBA_CORE_PACKAGE_DATABASE_LOADER_HPP
+
+#include "mamba/core/error_handling.hpp"
+#include "mamba/solver/libsolv/repo_info.hpp"
+#include "mamba/specs/channel.hpp"
+
+namespace mamba
+{
+    class Context;
+    class PrefixData;
+    class SubdirData;
+
+    namespace solver::libsolv
+    {
+        class Database;
+    }
+
+    void add_spdlog_logger_to_database(solver::libsolv::Database& db);
+
+    auto load_subdir_in_database(  //
+        const Context& ctx,
+        solver::libsolv::Database& db,
+        const SubdirData& subdir
+    ) -> expected_t<solver::libsolv::RepoInfo>;
+
+    auto load_installed_packages_in_database(
+        const Context& ctx,
+        solver::libsolv::Database& db,
+        const PrefixData& prefix
+    ) -> solver::libsolv::RepoInfo;
+}
+#endif