RED-10392 RED-10395 Improved component mapping query speed and performance for analysisRequired on FileStatus & Added Indexes
This commit is contained in:
parent
5ac68bf69d
commit
c595e509ec
@ -60,8 +60,9 @@ public class ReanalysisRequiredStatusService {
|
|||||||
Map<String, Map<VersionType, Long>> dossierTemplateVersionMap = new HashMap<>();
|
Map<String, Map<VersionType, Long>> dossierTemplateVersionMap = new HashMap<>();
|
||||||
Map<String, Long> dossierVersionMap = new HashMap<>();
|
Map<String, Long> dossierVersionMap = new HashMap<>();
|
||||||
Map<String, DossierEntity> dossierMap = new HashMap<>();
|
Map<String, DossierEntity> dossierMap = new HashMap<>();
|
||||||
|
Map<String, Map<String, Integer>> componentMappingVersionMap = new HashMap<>();
|
||||||
fileModels.forEach(entry -> {
|
fileModels.forEach(entry -> {
|
||||||
var analysisRequiredResult = computeAnalysisRequired(entry, ignoreProcessingStates, dossierTemplateVersionMap, dossierVersionMap, dossierMap);
|
var analysisRequiredResult = computeAnalysisRequired(entry, ignoreProcessingStates, dossierTemplateVersionMap, dossierVersionMap, dossierMap, componentMappingVersionMap);
|
||||||
entry.setReanalysisRequired(analysisRequiredResult.isReanalysisRequired());
|
entry.setReanalysisRequired(analysisRequiredResult.isReanalysisRequired());
|
||||||
entry.setFullAnalysisRequired(analysisRequiredResult.isFullAnalysisRequired());
|
entry.setFullAnalysisRequired(analysisRequiredResult.isFullAnalysisRequired());
|
||||||
entry.setComponentReanalysisRequired(analysisRequiredResult.isComponentReanalysisRequired());
|
entry.setComponentReanalysisRequired(analysisRequiredResult.isComponentReanalysisRequired());
|
||||||
@ -75,7 +76,8 @@ public class ReanalysisRequiredStatusService {
|
|||||||
boolean ignoreProcessingStates,
|
boolean ignoreProcessingStates,
|
||||||
Map<String, Map<VersionType, Long>> dossierTemplateVersionMap,
|
Map<String, Map<VersionType, Long>> dossierTemplateVersionMap,
|
||||||
Map<String, Long> dossierVersionMap,
|
Map<String, Long> dossierVersionMap,
|
||||||
Map<String, DossierEntity> dossierMap) {
|
Map<String, DossierEntity> dossierMap,
|
||||||
|
Map<String, Map<String, Integer>> componentMappingVersionMap) {
|
||||||
|
|
||||||
// enhance with dossierTemplateId
|
// enhance with dossierTemplateId
|
||||||
DossierEntity dossier;
|
DossierEntity dossier;
|
||||||
@ -118,7 +120,7 @@ public class ReanalysisRequiredStatusService {
|
|||||||
if (fileStatus.getLastFileAttributeChange() != null && fileStatus.getLastProcessed().isBefore(fileStatus.getLastFileAttributeChange())) {
|
if (fileStatus.getLastFileAttributeChange() != null && fileStatus.getLastProcessed().isBefore(fileStatus.getLastFileAttributeChange())) {
|
||||||
return new AnalysisRequiredResult(true, false);
|
return new AnalysisRequiredResult(true, false);
|
||||||
} else {
|
} else {
|
||||||
return requiresReanalysisBasedOnVersionDifference(fileStatus, dossier, dossierTemplateVersionMap, dossierVersionMap);
|
return requiresReanalysisBasedOnVersionDifference(fileStatus, dossier, dossierTemplateVersionMap, dossierVersionMap,componentMappingVersionMap);
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
return new AnalysisRequiredResult(false, false);
|
return new AnalysisRequiredResult(false, false);
|
||||||
@ -132,15 +134,17 @@ public class ReanalysisRequiredStatusService {
|
|||||||
private AnalysisRequiredResult requiresReanalysisBasedOnVersionDifference(FileModel fileStatus,
|
private AnalysisRequiredResult requiresReanalysisBasedOnVersionDifference(FileModel fileStatus,
|
||||||
DossierEntity dossier,
|
DossierEntity dossier,
|
||||||
Map<String, Map<VersionType, Long>> dossierTemplateVersionMap,
|
Map<String, Map<VersionType, Long>> dossierTemplateVersionMap,
|
||||||
Map<String, Long> dossierVersionMap) {
|
Map<String, Long> dossierVersionMap,
|
||||||
|
Map<String, Map<String,Integer>> componentMappingVersionMap) {
|
||||||
|
|
||||||
// get relevant versions
|
// get relevant versions
|
||||||
Map<VersionType, Long> dossierTemplateVersions = dossierTemplateVersionMap.computeIfAbsent(dossier.getDossierTemplateId(),
|
Map<VersionType, Long> dossierTemplateVersions = dossierTemplateVersionMap.computeIfAbsent(dossier.getDossierTemplateId(),
|
||||||
k -> buildVersionData(dossier.getDossierTemplateId()));
|
k -> buildVersionData(dossier.getDossierTemplateId()));
|
||||||
|
|
||||||
Map<String, Integer> componentMappingVersions = componentMappingService.getMetaDataByDossierTemplateId(dossier.getDossierTemplateId())
|
Map<String, Integer> componentMappingVersions = componentMappingVersionMap.computeIfAbsent(dossier.getDossierTemplateId(),
|
||||||
.stream()
|
k -> componentMappingService.getMetaDataByDossierTemplateId(dossier.getDossierTemplateId())
|
||||||
.collect(Collectors.toMap(ComponentMappingMetadata::getName, ComponentMappingMetadata::getVersion));
|
.stream()
|
||||||
|
.collect(Collectors.toMap(ComponentMappingMetadata::getName, ComponentMappingMetadata::getVersion)));
|
||||||
|
|
||||||
Long dossierDictionaryVersion = dossierVersionMap.computeIfAbsent(fileStatus.getDossierId(), k -> getDossierVersionData(fileStatus.getDossierId()));
|
Long dossierDictionaryVersion = dossierVersionMap.computeIfAbsent(fileStatus.getDossierId(), k -> getDossierVersionData(fileStatus.getDossierId()));
|
||||||
|
|
||||||
|
|||||||
@ -243,3 +243,5 @@ databaseChangeLog:
|
|||||||
file: db/changelog/tenant/149-remove-based-on-dict-annotation-id-columns.yaml
|
file: db/changelog/tenant/149-remove-based-on-dict-annotation-id-columns.yaml
|
||||||
- include:
|
- include:
|
||||||
file: db/changelog/tenant/149-add-indexes-across-tables-for-performance.yaml
|
file: db/changelog/tenant/149-add-indexes-across-tables-for-performance.yaml
|
||||||
|
- include:
|
||||||
|
file: db/changelog/tenant/150-add-component-mapping-indexes.yaml
|
||||||
|
|||||||
@ -0,0 +1,34 @@
|
|||||||
|
databaseChangeLog:
|
||||||
|
- changeSet:
|
||||||
|
id: create_index_if_not_exists_idx_component_mappings_dossier_template_id
|
||||||
|
author: Timo
|
||||||
|
preConditions:
|
||||||
|
- not:
|
||||||
|
indexExists:
|
||||||
|
indexName: idx_component_mappings_dossier_template_id
|
||||||
|
tableName: component_mappings
|
||||||
|
changes:
|
||||||
|
- createIndex:
|
||||||
|
tableName: component_mappings
|
||||||
|
indexName: idx_component_mappings_dossier_template_id
|
||||||
|
columns:
|
||||||
|
- column:
|
||||||
|
name: dossier_template_id
|
||||||
|
|
||||||
|
- changeSet:
|
||||||
|
id: create_index_if_not_exists_idx_component_mappings_dossier_template_id_name
|
||||||
|
author: Timo
|
||||||
|
preConditions:
|
||||||
|
- not:
|
||||||
|
indexExists:
|
||||||
|
indexName: idx_component_mappings_dossier_template_id_name
|
||||||
|
tableName: component_mappings
|
||||||
|
changes:
|
||||||
|
- createIndex:
|
||||||
|
tableName: component_mappings
|
||||||
|
indexName: idx_component_mappings_dossier_template_id_name
|
||||||
|
columns:
|
||||||
|
- column:
|
||||||
|
name: dossier_template_id
|
||||||
|
- column:
|
||||||
|
name: name
|
||||||
Loading…
x
Reference in New Issue
Block a user