Cleanup

Signed-off-by: Prabhat Aravind <[email protected]>

Author: prabhataravind

orchagent/dash/dashrouteorch.cpp

@@ -807,6 +807,7 @@ void DashRouteOrch::doTaskRouteGroupTable(ConsumerBase& consumer)
         if (op == SET_COMMAND)
         {
             dash::route_group::RouteGroup entry;
+            string version = entry.version();
             if (!parsePbMessage(kfvFieldsValues(t), entry))
             {
                 SWSS_LOG_WARN("Requires protobuf at RouteGroup :%s", route_group.c_str());
@@ -823,7 +824,7 @@ void DashRouteOrch::doTaskRouteGroupTable(ConsumerBase& consumer)
                 result = 1;
                 it++;
             }
-            writeResultToDB(dash_route_group_result_table_, route_group, result);
+            writeResultToDB(dash_route_group_result_table_, route_group, result, version);
         }
         else if (op == DEL_COMMAND)
         {

orchagent/saihelper.cpp

@@ -1136,15 +1136,8 @@ std::vector<sai_stat_id_t> queryAvailableCounterStats(const sai_object_type_t ob
     return stat_list;
 }
 
-FieldValueTuple makeResultDbEntry(uint32_t res)
-{
-    auto field = "result";
-    auto value = std::to_string(res);
-
-    return FieldValueTuple(field, value);
-}
-
-void writeResultToDB(const std::unique_ptr<swss::Table>& table, const string& key, uint32_t res)
+void writeResultToDB(const std::unique_ptr<swss::Table>& table, const string& key,
+                     uint32_t res, const string& version)
 {
     SWSS_LOG_ENTER();
 
@@ -1154,12 +1147,17 @@ void writeResultToDB(const std::unique_ptr<swss::Table>& table, const string& ke
         return;
     }
 
-    std::vector<FieldValueTuple> fvList = {
-        makeResultDbEntry(res)
-    };
+    std::vector<FieldValueTuple> fvVector;
+
+    fvVector.emplace_back("result", std::to_string(res));
+
+    if (!version.empty())
+    {
+        fvVector.emplace_back("version", version);
+    }
 
-    table->set(key, fvList);
-    SWSS_LOG_NOTICE("Wrote result to DB for key %s", key.c_str());
+    table->set(key, fvVector);
+    SWSS_LOG_INFO("Wrote result to DB for key %s", key.c_str());
 }
 
 void removeResultFromDB(const std::unique_ptr<swss::Table>& table, const string& key)
@@ -1172,5 +1170,6 @@ void removeResultFromDB(const std::unique_ptr<swss::Table>& table, const string&
         return;
     }
 
-    table_->del(key);
+    table->del(key);
+    SWSS_LOG_INFO("Removed result from DB for key %s", key.c_str());
 }

orchagent/saihelper.h

@@ -51,6 +51,6 @@ void stopFlexCounterPolling(sai_object_id_t switch_oid,
                             const std::string &key);
 
 std::vector<sai_stat_id_t> queryAvailableCounterStats(const sai_object_type_t);
-swss::FieldValueTuple makeResultDbEntry(uint32_t res);
-void writeResultToDB(const std::unique_ptr<swss::Table>&, const std::string& key, uint32_t res);
-void removeResultFromDB(const std::unique_ptr<swss::Table>& table, const string& key);
+void writeResultToDB(const std::unique_ptr<swss::Table>&, const std::string& key,
+                     uint32_t res, const std::string& version="");
+void removeResultFromDB(const std::unique_ptr<swss::Table>& table, const std::string& key);