Fix config save error for non-hash key. (#485)

swss-common: Fix config save error for non-hash key

- Fixing #467
- Cleanup #465

common/configdb.cpp

@@ -401,7 +401,8 @@ int ConfigDBPipeConnector_Native::_get_config(DBConnector& client, RedisTransact
     pipe.multi();
     for (auto const& key: keys)
     {
-        if (key == INIT_INDICATOR)
+        size_t pos = key.find(m_table_name_separator);
+        if (pos == string::npos)
         {
             continue;
         }
@@ -413,11 +414,6 @@ int ConfigDBPipeConnector_Native::_get_config(DBConnector& client, RedisTransact
 
     for (auto const& key: keys)
     {
-        if (key == INIT_INDICATOR)
-        {
-            continue;
-        }
-
         size_t pos = key.find(m_table_name_separator);
         string table_name = key.substr(0, pos);
         string row;

tests/test_redis_ut.py

@@ -383,6 +383,25 @@ def test_ConfigDBPipeConnector():
     allconfig = config_db.get_config()
     assert len(allconfig) == 0
 
+def test_ConfigDBPipeConnectorSeparator():
+    db = swsscommon.DBConnector("CONFIG_DB", 0, True)
+    config_db = ConfigDBPipeConnector()
+    config_db.db_connect("CONFIG_DB", False, False)
+    config_db.get_redis_client(config_db.CONFIG_DB).flushdb()
+    config_db.set_entry("TEST_PORT", "Ethernet222", {"alias": "etp2x"})
+    db.set("ItemWithoutSeparator", "item11")
+    allconfig = config_db.get_config()
+    assert "TEST_PORT" in allconfig
+    assert "ItemWithoutSeparator" not in allconfig
+
+    alltable = config_db.get_table("*")
+    assert "Ethernet222" in alltable
+
+    config_db.delete_table("TEST_PORT")
+    db.delete("ItemWithoutSeparator")
+    allconfig = config_db.get_config()
+    assert len(allconfig) == 0
+
 def test_ConfigDBScan():
     config_db = ConfigDBPipeConnector()
     config_db.connect(wait_for_init=False)