Merge pull request #301 from whdalsrnt/master

refactor: optimize query for performance
cloudforet-io · Oct 15, 2024 · d283e26 · d283e26
2 parents 3bafd59 + c781912
commit d283e26
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/src/spaceone/cost_analysis/manager/cost_manager.py b/src/spaceone/cost_analysis/manager/cost_manager.py
@@ -123,7 +123,7 @@ def list_costs(self, query: dict, domain_id: str, data_source_id: str):
         query = self._change_filter_project_group_id(query, domain_id)
         return self.cost_model.query(**query)
 
-    def stat_costs(self, query: dict, domain_id: str, data_source_id: str = None):
+    def stat_costs(self, query: dict, domain_id: str):
         query = self._change_filter_project_group_id(query, domain_id)
         return self.cost_model.stat(**query)
 

diff --git a/src/spaceone/cost_analysis/service/job_service.py b/src/spaceone/cost_analysis/service/job_service.py
@@ -782,16 +782,14 @@ def _delete_old_cost_data(self, data_source_id: str, domain_id: str):
         )
         monthly_cost_vos.delete()
 
-    def _distinct_job_id(
-        self, query_filter: list, domain_id: str, data_source_id: str
-    ) -> list:
+    def _distinct_job_id(self, query_filter: list, domain_id: str) -> list:
         query = {
             "distinct": "job_id",
             "filter": query_filter,
             "target": "PRIMARY",  # Execute a query to primary DB
         }
         _LOGGER.debug(f"[_distinct_job_id] query: {query}")
-        response = self.cost_mgr.stat_costs(query, domain_id, data_source_id)
+        response = self.cost_mgr.stat_monthly_costs(query, domain_id)
         values = response.get("results", [])
 
         _LOGGER.debug(f"[_distinct_job_id] job_ids: {values}")
@@ -814,9 +812,7 @@ def _delete_changed_cost_data(
         if end:
             query["filter"].append({"k": "billed_month", "v": end, "o": "lte"})
 
-        job_ids = self._distinct_job_id(
-            copy.deepcopy(query["filter"]), domain_id, job_vo.data_source_id
-        )
+        job_ids = self._distinct_job_id(copy.deepcopy(query["filter"]), domain_id)
 
         for key, value in change_filter.items():
             query["filter"].append({"k": key, "v": value, "o": "eq"})
@@ -903,7 +899,7 @@ def _distinct_billed_month(
             "target": "PRIMARY",  # Execute a query to primary DB
         }
         _LOGGER.debug(f"[_distinct_cost_data] query: {query}")
-        response = self.cost_mgr.stat_costs(query, domain_id, data_source_id)
+        response = self.cost_mgr.stat_costs(query, domain_id)
         values = response.get("results", [])
 
         _LOGGER.debug(f"[_distinct_cost_data] billed_month: {values}")