Revert "DBconnector to support namespaces. (#371)" (#375)

This reverts commit 1943e2b.

Author: judyjoseph

common/dbconnector.cpp

@@ -7,20 +7,11 @@
 #include <utility>
 
 #include <hiredis/hiredis.h>
-#define EMPTY_NAMESPACE std::string()
 
 namespace swss {
 
 class DBConnector;
 
-class RedisInstInfo
-{
-public:
-    std::string unixSocketPath;
-    std::string hostname;
-    int port;
-};
-
 class SonicDBInfo
 {
 public:
@@ -33,35 +24,25 @@ class SonicDBConfig
 {
 public:
     static void initialize(const std::string &file = DEFAULT_SONIC_DB_CONFIG_FILE);
-    static void initializeGlobalConfig(const std::string &file = DEFAULT_SONIC_DB_GLOBAL_CONFIG_FILE);
-    static void validateNamespace(const std::string &nameSpace);
-    static std::string getDbInst(const std::string &dbName, const std::string &nameSpace = EMPTY_NAMESPACE);
-    static int getDbId(const std::string &dbName, const std::string &nameSpace = EMPTY_NAMESPACE);
-    static std::string getSeparator(const std::string &dbName, const std::string &nameSpace = EMPTY_NAMESPACE);
-    static std::string getSeparator(int dbId, const std::string &nameSpace = EMPTY_NAMESPACE);
+    static std::string getDbInst(const std::string &dbName);
+    static int getDbId(const std::string &dbName);
+    static std::string getSeparator(const std::string &dbName);
+    static std::string getSeparator(int dbId);
     static std::string getSeparator(const DBConnector* db);
-    static std::string getDbSock(const std::string &dbName, const std::string &nameSpace = EMPTY_NAMESPACE);
-    static std::string getDbHostname(const std::string &dbName, const std::string &nameSpace = EMPTY_NAMESPACE);
-    static int getDbPort(const std::string &dbName, const std::string &nameSpace = EMPTY_NAMESPACE);
-    static std::vector<std::string> getNamespaces();
+    static std::string getDbSock(const std::string &dbName);
+    static std::string getDbHostname(const std::string &dbName);
+    static int getDbPort(const std::string &dbName);
     static bool isInit() { return m_init; };
-    static bool isGlobalInit() { return m_global_init; };
 
 private:
     static constexpr const char *DEFAULT_SONIC_DB_CONFIG_FILE = "/var/run/redis/sonic-db/database_config.json";
-    static constexpr const char *DEFAULT_SONIC_DB_GLOBAL_CONFIG_FILE = "/var/run/redis/sonic-db/database_global.json";
-    // { namespace { instName, { unix_socket_path, hostname, port } } }
-    static std::unordered_map<std::string, std::unordered_map<std::string, RedisInstInfo>> m_inst_info;
-    // { namespace, { dbName, {instName, dbId, separator} } }
-    static std::unordered_map<std::string, std::unordered_map<std::string, SonicDBInfo>> m_db_info;
-    // { namespace, { dbId, separator } }
-    static std::unordered_map<std::string, std::unordered_map<int, std::string>> m_db_separator;
+    // { instName, { unix_socket_path, {hostname, port} } }
+    static std::unordered_map<std::string, std::pair<std::string, std::pair<std::string, int>>> m_inst_info;
+    // { dbName, {instName, dbId} }
+    static std::unordered_map<std::string, SonicDBInfo> m_db_info;
+    // { dbIp, separator }
+    static std::unordered_map<int, std::string> m_db_separator;
     static bool m_init;
-    static bool m_global_init;
-    static void parseDatabaseConfig(const std::string &file,
-                                    std::unordered_map<std::string, RedisInstInfo> &inst_entry,
-                                    std::unordered_map<std::string, SonicDBInfo> &db_entry,
-                                    std::unordered_map<int, std::string> &separator_entry);
 };
 
 class DBConnector
@@ -79,14 +60,12 @@ class DBConnector
     DBConnector(int dbId, const std::string &hostname, int port, unsigned int timeout);
     DBConnector(int dbId, const std::string &unixPath, unsigned int timeout);
     DBConnector(const std::string &dbName, unsigned int timeout, bool isTcpConn = false);
-    DBConnector(const std::string &dbName, unsigned int timeout, bool isTcpConn, const std::string &nameSpace);
 
     ~DBConnector();
 
     redisContext *getContext() const;
     int getDbId() const;
     std::string getDbName() const;
-    std::string getNamespace() const;
 
     static void select(DBConnector *db);
 
@@ -105,7 +84,6 @@ class DBConnector
     redisContext *m_conn;
     int m_dbId;
     std::string m_dbName;
-    std::string m_namespace;
 };
 
 }

common/dbconnector.h

@@ -16,15 +16,6 @@ int RedisSelect::getFd()
 {
     return m_subscribe->getContext()->fd;
 }
-int RedisSelect::getDbConnectorId()
-{
-    return m_subscribe->getDbId();
-}
-
-std::string RedisSelect::getDbNamespace()
-{
-    return m_subscribe->getNamespace();
-}
 
 uint64_t RedisSelect::readData()
 {

common/redisselect.cpp

@@ -20,8 +20,6 @@ class RedisSelect : public Selectable
     bool hasCachedData() override;
     bool initializedWithData() override;
     void updateAfterRead() override;
-    int getDbConnectorId() override;
-    std::string getDbNamespace() override;
 
     /* Create a new redisContext, SELECT DB and SUBSCRIBE */
     void subscribe(DBConnector* db, const std::string &channelName);

common/redisselect.h

@@ -58,16 +58,6 @@ class Selectable
         return m_priority;
     }
 
-    virtual int getDbConnectorId()
-    {
-        return 0;
-    }
-
-    virtual std::string getDbNamespace()
-    {
-        return std::string();
-    }
-
 private:
 
     friend class Select;

common/selectable.h

@@ -28,7 +28,6 @@ tests_SOURCES = redis_ut.cpp                \
                 warm_restart_ut.cpp         \
                 redis_multi_db_ut.cpp       \
                 logger_ut.cpp               \
-                redis_multi_ns_ut.cpp       \
                 fdb_flush.cpp               \
                 main.cpp
 

tests/Makefile.am

@@ -7,11 +7,6 @@ using namespace swss;
 
 string existing_file = "./tests/redis_multi_db_ut_config/database_config.json";
 string nonexisting_file = "./tests/redis_multi_db_ut_config/database_config_nonexisting.json";
-string global_existing_file = "./tests/redis_multi_db_ut_config/database_global.json";
-
-#define TEST_DB  "APPL_DB"
-#define TEST_NAMESPACE  "asic0"
-#define INVALID_NAMESPACE  "invalid"
 
 class SwsscommonEnvironment : public ::testing::Environment {
 public:
@@ -37,39 +32,6 @@ class SwsscommonEnvironment : public ::testing::Environment {
         SonicDBConfig::initialize(existing_file);
         cout<<"INIT: load local db config file, isInit = "<<SonicDBConfig::isInit()<<endl;
         EXPECT_TRUE(SonicDBConfig::isInit());
-
-        // Test the database_global.json file
-        // by default , global_init should be false
-        cout<<"Default : isGlobalInit = "<<SonicDBConfig::isGlobalInit()<<endl;
-        EXPECT_FALSE(SonicDBConfig::isGlobalInit());
-
-        // Call an API which actually needs the data populated by SonicDBConfig::initializeGlobalConfig
-        try
-        {
-            cout<<"INIT: Invoking SonicDBConfig::getDbId(APPL_DB, asic0)"<<endl;
-            SonicDBConfig::getDbId(TEST_DB, TEST_NAMESPACE);
-        }
-        catch (exception &e)
-        {
-            EXPECT_TRUE(strstr(e.what(), "Initialize global DB config using API SonicDBConfig::initializeGlobalConfig"));
-        }
-
-        // load local global file, init should be true
-        SonicDBConfig::initializeGlobalConfig(global_existing_file);
-        cout<<"INIT: load global db config file, isInit = "<<SonicDBConfig::isGlobalInit()<<endl;
-        EXPECT_TRUE(SonicDBConfig::isGlobalInit());
-
-        // Call an API with wrong namespace passed
-        try
-        {
-            cout<<"INIT: Invoking SonicDBConfig::getDbId(APPL_DB, invalid)"<<endl;
-            SonicDBConfig::getDbId(TEST_DB, INVALID_NAMESPACE);
-        }
-        catch (exception &e)
-        {
-            EXPECT_TRUE(strstr(e.what(), "Namespace invalid is not a valid namespace name in config file"));
-        }
-
     }
 };