john-bodley commented on a change in pull request #15648:
URL: https://github.com/apache/superset/pull/15648#discussion_r668775930
##########
File path: superset/models/dashboard.py
##########
@@ -246,13 +256,24 @@ def data(self) -> Dict[str, Any]:
unless=lambda: not is_feature_enabled("DASHBOARD_CACHE"),
)
def datasets_trimmed_for_slices(self) -> List[Dict[str, Any]]:
- datasource_slices = utils.indexed(self.slices, "datasource")
- return [
- # Filter out unneeded fields from the datasource payload
- datasource.data_for_slices(slices)
- for datasource, slices in datasource_slices.items()
- if datasource
- ]
+ # Verbose but efficient database enumeration of dashboard datasources.
+ datasource_slices: Dict[
+ Tuple[Type["BaseDatasource"], int], Set[Slice]
+ ] = defaultdict(set)
+
+ for slc in self.slices:
+ datasource_slices[(slc.cls_model, slc.datasource_id)].add(slc)
+
+ result: List[Dict[str, Any]] = []
+
+ for (cls_model, datasource_id), slices in datasource_slices.items():
+ datasource =
db.session.query(cls_model).filter_by(id=datasource_id).first()
+
+ if datasource:
+ # Filter out unneeded fields from the datasource payload
+ result.append(datasource.data_for_slices(slices))
+
+ return result
Review comment:
@ktmud I’m sure there’s further optimizations, especially if all the
data is not required. This PR merely reduces the number of database requests.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
