[#1177] Create new class AtomDBFactory

src/atomdb/AtomDBFactory.cc

@@ -0,0 +1,38 @@
+#include "AtomDBFactory.h"
+
+#include "InMemoryDB.h"
+#include "MorkDB.h"
+#include "RedisMongoDB.h"
+#include "Utils.h"
+
+using namespace atomdb;
+using namespace commons;
+
+// --------------------------------------------------------------------------------
+// Public methods
+
+shared_ptr<AtomDB> AtomDBFactory::create(const JsonConfig& config, const string& context) {
+    return wrap_if_protected(create_backend(config, context));
+}
+
+shared_ptr<AtomDB> AtomDBFactory::create_backend(const JsonConfig& config, const string& context) {
+    auto atomdb_type = config.at_path("type").get_or<string>("");
+
+    if (atomdb_type == "redismongodb") {
+        return shared_ptr<AtomDB>(new RedisMongoDB(context, false, config));
+    }
+    if (atomdb_type == "morkdb") {
+        return shared_ptr<AtomDB>(new MorkDB(context, config));
+    }
+    if (atomdb_type == "inmemorydb") {
+        return make_shared<InMemoryDB>(context.empty() ? "inmemorydb_" : context);
+    }
+
+    RAISE_ERROR("AtomDBFactory: unsupported AtomDB type: " + atomdb_type);
+    return shared_ptr<AtomDB>{};
+}
+
+shared_ptr<AtomDB> AtomDBFactory::wrap_if_protected(shared_ptr<AtomDB> backend) {
+    // AtomDBFactory::wrap_if_protected() is not implemented yet.
+    return backend;
+}

src/atomdb/AtomDBFactory.h

@@ -0,0 +1,39 @@
+#pragma once
+
+#include <memory>
+#include <string>
+
+#include "AtomDB.h"
+#include "JsonConfig.h"
+
+using namespace std;
+using namespace commons;
+
+namespace atomdb {
+
+/**
+ * @brief Single entry point to construct concrete AtomDB backends.
+ *
+ * Use this instead of calling RedisMongoDB/MorkDB/InMemoryDB constructors directly.
+ */
+class AtomDBFactory {
+   public:
+    /**
+     * @brief Creates a backend and wraps it with ProtectedAtomDB when is_protected().
+     */
+    static shared_ptr<AtomDB> create(const JsonConfig& config, const string& context = "");
+
+    /**
+     * @brief Creates a concrete backend without authorization wrapping.
+     *
+     * Supported types: redismongodb, morkdb, inmemorydb.
+     */
+    static shared_ptr<AtomDB> create_backend(const JsonConfig& config, const string& context = "");
+
+    /**
+     * @brief Wraps backend with ProtectedAtomDB when protected and not already wrapped.
+     */
+    static shared_ptr<AtomDB> wrap_if_protected(shared_ptr<AtomDB> backend);
+};
+
+}  // namespace atomdb

src/atomdb/AtomDBSingleton.cc

@@ -1,8 +1,7 @@
 #include "AtomDBSingleton.h"
 
 #include "AdapterDB.h"
-#include "MorkDB.h"
-#include "RedisMongoDB.h"
+#include "AtomDBFactory.h"
 #include "RemoteAtomDB.h"
 #include "Utils.h"
 
@@ -19,24 +18,25 @@ void AtomDBSingleton::init(const JsonConfig& atomdb_config) {
     if (AtomDBSingleton::initialized) {
         RAISE_ERROR(
             "AtomDBSingleton already initialized. AtomDBSingleton::init() should be called only once.");
+    }
+
+    shared_ptr<AtomDB> atomdb;
+    auto atomdb_type = atomdb_config.at_path("type").get_or<string>("");
+
+    if (atomdb_type == "remotedb") {
+        auto remote_peers_config =
+            atomdb_config.at_path("remote_peers").get_or<JsonConfig>(JsonConfig());
+        atomdb = shared_ptr<AtomDB>(new RemoteAtomDB(remote_peers_config));
+        atomdb = AtomDBFactory::wrap_if_protected(atomdb);
+    } else if (atomdb_type == "adapterdb") {
+        atomdb = shared_ptr<AtomDB>(new AdapterDB(atomdb_config));
+        atomdb = AtomDBFactory::wrap_if_protected(atomdb);
     } else {
-        auto atomdb_type = atomdb_config.at_path("type").get_or<string>("");
-        if (atomdb_type == "morkdb") {
-            AtomDBSingleton::atom_db = shared_ptr<AtomDB>(new MorkDB("", atomdb_config));
-        } else if (atomdb_type == "redismongodb") {
-            AtomDBSingleton::atom_db = shared_ptr<AtomDB>(new RedisMongoDB("", false, atomdb_config));
-        } else if (atomdb_type == "remotedb") {
-            auto remote_peers_config =
-                atomdb_config.at_path("remote_peers").get_or<JsonConfig>(JsonConfig());
-            AtomDBSingleton::atom_db = shared_ptr<AtomDB>(new RemoteAtomDB(remote_peers_config));
-        } else if (atomdb_type == "adapterdb") {
-            AtomDBSingleton::atom_db = shared_ptr<AtomDB>(new AdapterDB(atomdb_config));
-        } else {
-            RAISE_ERROR("Invalid AtomDB type: " + atomdb_type);
-        }
-
-        AtomDBSingleton::initialized = true;
+        atomdb = AtomDBFactory::create(atomdb_config);
     }
+
+    AtomDBSingleton::atom_db = atomdb;
+    AtomDBSingleton::initialized = true;
 }
 
 shared_ptr<AtomDB> AtomDBSingleton::get_instance() {

src/atomdb/BUILD

@@ -8,6 +8,7 @@ cc_library(
     deps = [
         ":atomdb",
         ":atomdb_api_types",
+        ":atomdb_factory",
         ":atomdb_singleton",
         ":atomdbutils",
         "//atomdb/adapterdb:adapterdb_lib",
@@ -18,6 +19,20 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "atomdb_factory",
+    srcs = ["AtomDBFactory.cc"],
+    hdrs = ["AtomDBFactory.h"],
+    includes = ["."],
+    deps = [
+        ":atomdb",
+        "//atomdb/inmemorydb",
+        "//atomdb/morkdb",
+        "//atomdb/redis_mongodb",
+        "//commons:commons_lib",
+    ],
+)
+
 cc_library(
     name = "atomdb",
     hdrs = ["AtomDB.h"],
@@ -56,10 +71,9 @@ cc_library(
     hdrs = ["AtomDBSingleton.h"],
     includes = ["."],
     deps = [
+        ":atomdb_factory",
         "//atomdb:atomdb_api_types",
         "//atomdb/adapterdb",
-        "//atomdb/morkdb",
-        "//atomdb/redis_mongodb",
         "//atomdb/remotedb:remotedb_lib",
         "//commons:commons_lib",
     ],

src/atomdb/adapterdb/AdapterDB.cc

@@ -3,17 +3,16 @@
 #include <chrono>
 #include <thread>
 
+#include "AtomDBFactory.h"
 #include "AtomPersister.h"
 #include "BoundedSharedQueue.h"
 #include "DatabaseOrchestrator.h"
 #include "DedicatedThread.h"
 #include "MongoInitializer.h"
-#include "MorkDB.h"
 #include "MorkMappingStrategy.h"
 #include "PostgresMappingStrategy.h"
 #include "PostgresWrapper.h"
 #include "Processor.h"
-#include "RedisMongoDB.h"
 #include "RemoteAtomDB.h"
 #include "Utils.h"
 #include "expression_hasher.h"
@@ -314,12 +313,12 @@ void AdapterDB::atomdb_backend_setup() {
     auto atomdb_backend_config =
         this->config.at_path("adapterdb.atomdb_backend").get_or<JsonConfig>(JsonConfig());
     string atomdb_backend_type = atomdb_backend_config.at_path("type").get_or<string>("");
-    if (atomdb_backend_type == "morkdb") {
-        this->atomdb_backend = shared_ptr<AtomDB>(new MorkDB("", atomdb_backend_config));
-    } else if (atomdb_backend_type == "redismongodb") {
-        this->atomdb_backend = shared_ptr<AtomDB>(new RedisMongoDB("", false, atomdb_backend_config));
-    } else if (atomdb_backend_type == "remotedb") {
-        this->atomdb_backend = shared_ptr<AtomDB>(new RemoteAtomDB(atomdb_backend_config));
+    if (atomdb_backend_type == "remotedb") {
+        this->atomdb_backend = AtomDBFactory::wrap_if_protected(
+            shared_ptr<AtomDB>(new RemoteAtomDB(atomdb_backend_config)));
+    } else if (atomdb_backend_type == "morkdb" || atomdb_backend_type == "redismongodb" ||
+               atomdb_backend_type == "inmemorydb") {
+        this->atomdb_backend = AtomDBFactory::create(atomdb_backend_config);
     } else {
         RAISE_ERROR("Invalid AtomDB type: " + atomdb_backend_type);
     }

src/atomdb/adapterdb/BUILD

@@ -17,8 +17,7 @@ cc_library(
     includes = ["."],
     deps = [
         "//atomdb",
-        "//atomdb/morkdb",
-        "//atomdb/redis_mongodb",
+        "//atomdb:atomdb_factory",
         "//atomdb/remotedb:remotedb_lib",
         "//commons:commons_lib",
         "//commons/atoms:atoms_lib",

src/atomdb/redis_mongodb/RedisMongoDB.h

@@ -28,7 +28,6 @@ enum MONGODB_FIELD { ID = 0, NAME, TARGETS, NAMED_TYPE, size };
 
 class RedisMongoDB : public AtomDB {
    public:
-    RedisMongoDB(const string& context, bool skip_redis, const JsonConfig& config);
     ~RedisMongoDB();
 
     bool allow_nested_indexing() override;
@@ -146,6 +145,11 @@ class RedisMongoDB : public AtomDB {
                                           map<string, vector<string>>& composite_type_entries_map);
 
    private:
+    friend class AtomDBFactory;
+    friend class MorkDB;
+
+    RedisMongoDB(const string& context, bool skip_redis, const JsonConfig& config);
+
     string context;
     bool skip_redis_;
     bool composite_type_enabled_;

src/atomdb/remotedb/BUILD

@@ -24,10 +24,9 @@ cc_library(
     deps = [
         "//atomdb",
         "//atomdb:atomdb_api_types",
+        "//atomdb:atomdb_factory",
         "//atomdb/inmemorydb",
         "//atomdb/inmemorydb:inmemorydb_api_types",
-        "//atomdb/morkdb:morkdb_lib",
-        "//atomdb/redis_mongodb:redis_mongodb_lib",
         "//commons:commons_lib",
         "//commons/atoms:atoms_lib",
         "//commons/processor:processor_lib",

src/atomdb/remotedb/RemoteAtomDB.cc

@@ -7,11 +7,9 @@
 #include <sstream>
 #include <utility>
 
-#include "InMemoryDB.h"
+#include "AtomDBFactory.h"
 #include "InMemoryDBAPITypes.h"
 #include "Logger.h"
-#include "MorkDB.h"
-#include "RedisMongoDB.h"
 #include "Utils.h"
 
 using namespace atomdb;
@@ -20,48 +18,29 @@ using namespace commons;
 
 using json = nlohmann::json;
 
-namespace {
-
-shared_ptr<AtomDB> create_atomdb_from_config(const JsonConfig& config) {
-    string uid = config.at_path("uid").get_or<string>("");
-    string type = config.at_path("type").get_or<string>("");
-    string context = config.at_path("context").get_or<string>("");
-
-    if (type == "inmemorydb") {
-        return make_shared<InMemoryDB>(context.empty() ? "remotedb_" : context);
-    }
-
-    if (type == "redismongodb") {
-        RedisMongoDB::initialize_statics(context);
-        auto atomdb = make_shared<RedisMongoDB>(context, false, config);
-        return atomdb;
-    }
-
-    if (type == "morkdb") {
-        auto atomdb = make_shared<MorkDB>(context, config);
-        return atomdb;
-    }
-
-    RAISE_ERROR("Unknown AtomDB type for peer " + uid + ": " + type);
-    return nullptr;
-}
-
-}  // namespace
-
 RemoteAtomDB::RemoteAtomDB(const JsonConfig& peers_config) {
     for (auto& entry : peers_config) {
         auto peer_config = JsonConfig(entry);
         string uid = peer_config.at_path("uid").get_or<string>("");
         if (uid.empty()) continue;
 
+        string context = peer_config.at_path("context").get_or<string>("");
+        if (context.empty()) {
+            context = "remotedb_";
+        }
+
         shared_ptr<AtomDB> local_persistence = nullptr;
         auto local_persistence_config =
             peer_config.at_path("local_persistence").get_or<JsonConfig>(JsonConfig());
         if (!local_persistence_config.empty()) {
-            local_persistence = create_atomdb_from_config(local_persistence_config);
+            string local_context = local_persistence_config.at_path("context").get_or<string>(context);
+            if (local_context.empty()) {
+                local_context = context;
+            }
+            local_persistence = AtomDBFactory::create(local_persistence_config, local_context);
         }
         remote_db_[uid] = make_shared<RemoteAtomDBPeer>(
-            create_atomdb_from_config(peer_config), local_persistence, uid);
+            AtomDBFactory::create(peer_config, context), local_persistence, uid);
     }
 
     LOG_INFO("RemoteAtomDB initialized with " << remote_db_.size() << " remote peers");

src/main/BUILD

@@ -58,9 +58,9 @@ cc_library(
     srcs = ["db_loader.cc"],
     deps = [
         "//atomdb:atomdb_api_types",
+        "//atomdb:atomdb_factory",
         "//atomdb:atomdb_singleton",
         "//atomdb/adapterdb:adapterdb_lib",
-        "//atomdb/morkdb:morkdb_lib",
         "//atomdb/redis_mongodb:redis_mongodb_lib",
         "//atomdb/remotedb:remotedb_lib",
         "//commons:commons_lib",

src/main/db_loader.cc

@@ -8,12 +8,12 @@
 #include <vector>
 
 #include "AdapterDB.h"
+#include "AtomDBFactory.h"
 #include "AtomDBSingleton.h"
 #include "JsonConfig.h"
 #include "JsonConfigParser.h"
 #include "MettaParser.h"
 #include "MettaParserActions.h"
-#include "MorkDB.h"
 #include "RedisMongoDB.h"
 #include "RemoteAtomDB.h"
 #include "Utils.h"
@@ -73,18 +73,16 @@ int main(int argc, char* argv[]) {
     auto atomdb_config = json_config.at_path("atomdb").get_or<JsonConfig>(JsonConfig());
 
     auto atomdb_type = atomdb_config.at_path("type").get_or<string>("");
-    if (atomdb_type == "redismongodb") {
-        AtomDBSingleton::provide(make_shared<RedisMongoDB>(context, false, atomdb_config));
-    } else if (atomdb_type == "morkdb") {
-        AtomDBSingleton::provide(make_shared<MorkDB>(context, atomdb_config));
-    } else if (atomdb_type == "remotedb") {
+    if (atomdb_type == "remotedb") {
         auto remote_peers_config =
             atomdb_config.at_path("remote_peers").get_or<JsonConfig>(JsonConfig());
-        AtomDBSingleton::provide(make_shared<RemoteAtomDB>(remote_peers_config));
+        AtomDBSingleton::provide(
+            AtomDBFactory::wrap_if_protected(shared_ptr<AtomDB>(new RemoteAtomDB(remote_peers_config))));
     } else if (atomdb_type == "adapterdb") {
-        AtomDBSingleton::provide(make_shared<AdapterDB>(atomdb_config));
+        AtomDBSingleton::provide(
+            AtomDBFactory::wrap_if_protected(shared_ptr<AtomDB>(new AdapterDB(atomdb_config))));
     } else {
-        RAISE_ERROR("Invalid AtomDB type: " + atomdb_type);
+        AtomDBSingleton::provide(AtomDBFactory::create(atomdb_config, context));
     }
 
     signal(SIGINT, &ctrl_c_handler);