Fix ElasticSearch error with filter deletion

Signed-off-by: BOUHOURS Antoine <[email protected]>
gridsuite · Dec 26, 2024 · a8f2521 · a8f2521
1 parent 82bc06a
commit a8f2521
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/src/main/java/org/gridsuite/modification/server/elasticsearch/EquipmentInfosService.java b/src/main/java/org/gridsuite/modification/server/elasticsearch/EquipmentInfosService.java
@@ -35,6 +35,9 @@ public class EquipmentInfosService {
     @Value("${spring.data.elasticsearch.partition-size:10000}")
     private int partitionSize;
 
+    @Value("${spring.data.elasticsearch.max-clause-count:2048}")
+    public int maxClauseCount;
+
     public static final Set<String> EXCLUDED_TYPES_FOR_INDEXING = Set.of(IdentifiableType.SWITCH.name());
 
     public EquipmentInfosService(EquipmentInfosRepository equipmentInfosRepository, TombstonedEquipmentInfosRepository tombstonedEquipmentInfosRepository) {
@@ -59,7 +62,9 @@ public void addAllTombstonedEquipmentInfos(@NonNull final List<TombstonedEquipme
     }
 
     public void deleteEquipmentInfosList(@NonNull List<String> equipmentIds, @NonNull UUID networkUuid, @NonNull String variantId) {
-        equipmentInfosRepository.deleteByIdInAndNetworkUuidAndVariantId(equipmentIds, networkUuid, variantId);
+        Lists.partition(equipmentIds, maxClauseCount)
+                .parallelStream()
+                .forEach(ids -> equipmentInfosRepository.deleteByIdInAndNetworkUuidAndVariantId(ids, networkUuid, variantId));
     }
 
     public void deleteVariants(@NonNull UUID networkUuid, List<String> variantIds) {
@@ -88,10 +93,6 @@ public void cloneVariantModifications(@NonNull UUID networkUuid, @NonNull String
         );
     }
 
-    public List<EquipmentInfos> findEquipmentInfosList(List<String> equipmentIds, UUID networkUuid, String variantId) {
-        return equipmentInfosRepository.findByIdInAndNetworkUuidAndVariantId(equipmentIds, networkUuid, variantId);
-    }
-
     public void deleteAll() {
         equipmentInfosRepository.deleteAll();
         tombstonedEquipmentInfosRepository.deleteAll();

diff --git a/src/main/java/org/gridsuite/modification/server/modifications/NetworkStoreListener.java b/src/main/java/org/gridsuite/modification/server/modifications/NetworkStoreListener.java
@@ -22,7 +22,6 @@
 import org.gridsuite.modification.server.impacts.SimpleElementImpact.SimpleImpactType;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 import static org.gridsuite.modification.NetworkModificationException.Type.MODIFICATION_ERROR;
 
@@ -245,20 +244,13 @@ private static EquipmentInfos toEquipmentInfos(Identifiable<?> identifiable, UUI
 
     private void flushEquipmentInfos() {
         String variantId = network.getVariantManager().getWorkingVariantId();
-        Set<String> presentEquipmentDeletionsIds = equipmentInfosService.findEquipmentInfosList(
-                deletedEquipments.stream().map(EquipmentInfosToDelete::id).toList(),
-                networkUuid,
-                variantId
-        ).stream().map(EquipmentInfos::getId).collect(Collectors.toSet());
 
         List<String> equipmentDeletionsIds = new ArrayList<>();
         List<TombstonedEquipmentInfos> tombstonedEquipmentInfos = new ArrayList<>();
         deletedEquipments.forEach(deletedEquipment -> {
-            if (presentEquipmentDeletionsIds.contains(deletedEquipment.id())) {
-                equipmentDeletionsIds.add(deletedEquipment.id());
-            }
             // add only allowed equipments types to be indexed to tombstonedEquipmentInfos
             if (!EquipmentInfosService.EXCLUDED_TYPES_FOR_INDEXING.contains(deletedEquipment.type())) {
+                equipmentDeletionsIds.add(deletedEquipment.id());
                 tombstonedEquipmentInfos.add(
                         TombstonedEquipmentInfos.builder()
                                 .networkUuid(networkUuid)