Exclude unused attributes in dashboard copies from getAllDashboardsMe…

…tadataCopy Signed-off-by: Misiu Godfrey <misiu.godfrey@kraken.mapd.com>
SINHASantos · Aug 26, 2024 · fffa098 · fffa098
1 parent 3fe46bd
commit fffa098
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/Catalog/Catalog.cpp b/Catalog/Catalog.cpp
@@ -2217,12 +2217,19 @@ list<const DashboardDescriptor*> Catalog::getAllDashboardsMetadata() const {
   return dashboards;
 }
 
-std::vector<DashboardDescriptor> Catalog::getAllDashboardsMetadataCopy() const {
+std::vector<DashboardDescriptor> Catalog::getAllDashboardsMetadataForSysTable() const {
   cat_read_lock read_lock(this);
   std::vector<DashboardDescriptor> dashboards;
   dashboards.reserve(dashboardDescriptorMap_.size());
   for (auto dashboard_entry : dashboardDescriptorMap_) {
-    dashboards.emplace_back(*dashboard_entry.second);
+    const auto& cat_dashboard = dashboard_entry.second;
+    dashboards.emplace_back();
+    auto& dashboard = dashboards.back();
+    dashboard.dashboardId = cat_dashboard->dashboardId;
+    dashboard.dashboardName = cat_dashboard->dashboardName;
+    dashboard.userId = cat_dashboard->userId;
+    dashboard.updateTime = cat_dashboard->updateTime;
+    dashboard.dashboardMetadata = cat_dashboard->dashboardMetadata;
   }
   return dashboards;
 }

diff --git a/Catalog/Catalog.h b/Catalog/Catalog.h
@@ -261,7 +261,7 @@ class Catalog final {
   std::list<const TableDescriptor*> getAllTableMetadata() const;
   std::vector<TableDescriptor> getAllTableMetadataCopy() const;
   std::list<const DashboardDescriptor*> getAllDashboardsMetadata() const;
-  std::vector<DashboardDescriptor> getAllDashboardsMetadataCopy() const;
+  std::vector<DashboardDescriptor> getAllDashboardsMetadataForSysTable() const;
   const DBMetadata& getCurrentDB() const { return currentDB_; }
   Data_Namespace::DataMgr& getDataMgr() const { return *dataMgr_; }
   std::shared_ptr<Calcite> getCalciteMgr() const { return calciteMgr_; }

diff --git a/DataMgr/ForeignStorage/InternalCatalogDataWrapper.cpp b/DataMgr/ForeignStorage/InternalCatalogDataWrapper.cpp
@@ -464,7 +464,7 @@ std::map<int32_t, std::vector<DashboardDescriptor>> get_all_dashboards() {
   auto& sys_catalog = Catalog_Namespace::SysCatalog::instance();
   for (const auto& catalog : sys_catalog.getCatalogsForAllDbs()) {
     if (catalog->name() != shared::kInfoSchemaDbName) {
-      for (const auto& dashboard : catalog->getAllDashboardsMetadataCopy()) {
+      for (const auto& dashboard : catalog->getAllDashboardsMetadataForSysTable()) {
         dashboards_by_database[catalog->getDatabaseId()].emplace_back(dashboard);
       }
     }