MaDgIK
/
uoa-repository-manager-service
13
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve performance of "DashboardController.getCollectionMonitorSummary()"-endpoint. 

Now, a single "getRepositoryAggregations"-call is made, which results in just one "DSM-aggregationhistory"-api-call. Previously, multiple api-calls where made, each requesting the whole "aggregationhistory"-data and then trimming it down to only a few results.
This commit is contained in:
Lampros Smyrnaios 2023-02-03 14:19:43 +02:00
parent c1abaad3e1
commit 06cea537bf
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/eu/dnetlib/repo/manager/controllers/DashboardController.java
View File

@ -55,31 +55,21 @@ public class DashboardController {
@PreAuthorize("hasAuthority('REGISTERED_USER')") @PreAuthorize("hasAuthority('REGISTERED_USER')")
public CollectionMonitorSummary getCollectionMonitorSummary( public CollectionMonitorSummary getCollectionMonitorSummary(
@PathVariable("repoId") String repoId, @PathVariable("repoId") String repoId,
@RequestParam(name = "size", required = false, defaultValue = "20") int size) throws JSONException { @RequestParam(name = "size", required = false, defaultValue = "20") int summarySize) throws JSONException {
// Get the "aggregationInfo" for the first <number of> requested aggregations. List<AggregationInfo> aggregationInfoList = aggregationService.getRepositoryAggregations(repoId);
List<AggregationInfo> aggregationInfoList = aggregationService.getRepositoryAggregations(repoId, 0, size);
CollectionMonitorSummary collectionMonitorSummary = new CollectionMonitorSummary(); CollectionMonitorSummary collectionMonitorSummary = new CollectionMonitorSummary();
collectionMonitorSummary.setAggregationInfo(aggregationInfoList); // Set the "aggregationInfo" for the first <number of> requested aggregations, in order to create a "summary".
collectionMonitorSummary.setAggregationInfo(aggregationInfoList.subList(0, Math.min(summarySize, aggregationInfoList.size())));
// Search for the last indexed version, from the beginning of the list. // Search for the last indexed version and set the "collectionMonitorSummary".
for ( AggregationInfo aggregationInfo : aggregationInfoList ) {
// TODO - WARNING! This is very slow, since each time it requests the next 50, it re-requests the whole list from the "/ds/aggregationhistory/" DSM-endpoint. if ( aggregationInfo.isIndexedVersion() ) {
// inside "AggregationServiceImpl.getRepositoryAggregations()". Then it splits the list in a chunk of 50 and then iterate though it here.. collectionMonitorSummary.setLastIndexedVersion(aggregationInfo);
// Since we already request the whole list each time anyway, just take that use it here!! break;
size = 0;
do {
aggregationInfoList = aggregationService.getRepositoryAggregations(repoId, size, size + 50);
for (AggregationInfo aggregationInfo : aggregationInfoList) {
if (aggregationInfo.isIndexedVersion()) {
collectionMonitorSummary.setLastIndexedVersion(aggregationInfo);
break;
}
} }
size += 50; }
} while (aggregationInfoList.size() != 0 && collectionMonitorSummary.getLastIndexedVersion() == null);
return collectionMonitorSummary; return collectionMonitorSummary;
} }