Use voltageLevelId to improve getBus() lookup time (#496)

* Optimization by using voltage level id in bus modifications. * Change preloading strategy for voltage init modifications. * Deal with existing modifications in database. Signed-off-by: Franck LECUYER <[email protected]>
gridsuite · Jul 10, 2024 · 6928386 · 6928386
1 parent c7895ad
commit 6928386
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 4 deletions.
diff --git a/src/main/java/org/gridsuite/modification/server/ModificationType.java b/src/main/java/org/gridsuite/modification/server/ModificationType.java
@@ -44,7 +44,7 @@ public enum ModificationType {
     DELETE_VOLTAGE_LEVEL_ON_LINE(PreloadingStrategy.NONE),
     DELETE_ATTACHING_LINE(PreloadingStrategy.NONE),
     GENERATION_DISPATCH(PreloadingStrategy.COLLECTION),
-    VOLTAGE_INIT_MODIFICATION(PreloadingStrategy.COLLECTION),
+    VOLTAGE_INIT_MODIFICATION(PreloadingStrategy.ALL_COLLECTIONS_NEEDED_FOR_BUS_VIEW),
     VSC_CREATION(PreloadingStrategy.NONE),
     VSC_MODIFICATION(PreloadingStrategy.NONE),
     CONVERTER_STATION_CREATION(PreloadingStrategy.NONE),

diff --git a/src/main/java/org/gridsuite/modification/server/dto/VoltageInitBusModificationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/VoltageInitBusModificationInfos.java
@@ -23,6 +23,9 @@
 @Setter
 @Schema(description = "Voltage init bus modfication infos")
 public class VoltageInitBusModificationInfos {
+    @Schema(description = "Voltage level id")
+    private String voltageLevelId;
+
     @Schema(description = "Bus id")
     private String busId;
 

diff --git a/...fication/server/entities/equipment/modification/VoltageInitBusModificationEmbeddable.java b/...fication/server/entities/equipment/modification/VoltageInitBusModificationEmbeddable.java
@@ -23,6 +23,9 @@
 @Getter
 @Embeddable
 public class VoltageInitBusModificationEmbeddable {
+    @Column
+    private String voltageLevelId;
+
     @Column
     private String busId;
 

diff --git a/...te/modification/server/entities/equipment/modification/VoltageInitModificationEntity.java b/...te/modification/server/entities/equipment/modification/VoltageInitModificationEntity.java
@@ -163,14 +163,14 @@ private List<VoltageInitShuntCompensatorModificationInfos> toShuntCompensatorsMo
 
     public static List<VoltageInitBusModificationEmbeddable> toEmbeddableVoltageInitBuses(List<VoltageInitBusModificationInfos> buses) {
         return buses == null ? null : buses.stream()
-            .map(bus -> new VoltageInitBusModificationEmbeddable(bus.getBusId(), bus.getV(), bus.getAngle()))
+            .map(bus -> new VoltageInitBusModificationEmbeddable(bus.getVoltageLevelId(), bus.getBusId(), bus.getV(), bus.getAngle()))
             .collect(Collectors.toList());
     }
 
     private List<VoltageInitBusModificationInfos> toBusesModification(List<VoltageInitBusModificationEmbeddable> buses) {
         return buses != null ? buses
             .stream()
-            .map(bus -> new VoltageInitBusModificationInfos(bus.getBusId(), bus.getV(), bus.getAngle()))
+            .map(bus -> new VoltageInitBusModificationInfos(bus.getVoltageLevelId(), bus.getBusId(), bus.getV(), bus.getAngle()))
             .collect(Collectors.toList()) : null;
     }
 

diff --git a/src/main/java/org/gridsuite/modification/server/modifications/VoltageInitModification.java b/src/main/java/org/gridsuite/modification/server/modifications/VoltageInitModification.java
@@ -79,7 +79,14 @@ private void applyBusModification(Network network, ReportNode subReportNode) {
         int modificationsCount = 0;
         List<ReportNode> reports = new ArrayList<>();
         for (VoltageInitBusModificationInfos m : voltageInitModificationInfos.getBuses()) {
-            final Bus bus = network.getBusView().getBus(m.getBusId());
+            String voltageLevelId = m.getVoltageLevelId();
+            Bus bus;
+            if (voltageLevelId != null) {
+                final VoltageLevel voltageLevel = network.getVoltageLevel(voltageLevelId);
+                bus = voltageLevel.getBusView().getBus(m.getBusId());
+            } else {
+                bus = network.getBusView().getBus(m.getBusId());
+            }
             if (bus == null) {
                 reports.add(ReportNode.newRootReportNode()
                         .withMessageTemplate("busNotFound", "Bus with id=${id} not found")

diff --git a/src/main/resources/db/changelog/changesets/changelog_20240709T090545Z.xml b/src/main/resources/db/changelog/changesets/changelog_20240709T090545Z.xml
@@ -0,0 +1,8 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
+    <changeSet author="lecuyerfra (generated)" id="1720515985912-29">
+        <addColumn tableName="voltage_init_bus_modification">
+            <column name="voltage_level_id" type="varchar(255)"/>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/db/changelog/db.changelog-master.yaml b/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -297,3 +297,6 @@ databaseChangeLog:
   - include:
       file: changesets/changelog_20240617T212921Z.xml
       relativeToChangelogFile: true
+  - include:
+      file: changesets/changelog_20240709T090545Z.xml
+      relativeToChangelogFile: true
diff --git a/src/test/java/org/gridsuite/modification/server/ModificationControllerTest.java b/src/test/java/org/gridsuite/modification/server/ModificationControllerTest.java
@@ -1417,11 +1417,13 @@ public void testCreateVoltageInitModification() throws Exception {
                     .build()))
             .buses(List.of(
                 VoltageInitBusModificationInfos.builder()
+                    .voltageLevelId("v1")
                     .busId("1.1")
                     .v(225.)
                     .angle(0.)
                     .build(),
                 VoltageInitBusModificationInfos.builder()
+                    .voltageLevelId("v1")
                     .busId("1.2")
                     .v(226.)
                     .angle(0.6)

diff --git a/...est/java/org/gridsuite/modification/server/modifications/VoltageInitModificationTest.java b/...est/java/org/gridsuite/modification/server/modifications/VoltageInitModificationTest.java
@@ -192,11 +192,13 @@ protected ModificationInfos buildModification() {
                     .build()))
             .buses(List.of(
                 VoltageInitBusModificationInfos.builder()
+                    .voltageLevelId("v2")
                     .busId("busNotFound")
                     .v(400.)
                     .angle(0.)
                     .build(),
                 VoltageInitBusModificationInfos.builder()
+                    .voltageLevelId("v1")
                     .busId("v1_0")
                     .v(230.)
                     .angle(0.5)

diff --git a/src/test/java/org/gridsuite/modification/server/service/ModificationRepositoryTest.java b/src/test/java/org/gridsuite/modification/server/service/ModificationRepositoryTest.java
@@ -1190,11 +1190,13 @@ public void testVoltageInitModification() {
                     .build()))
             .buses(List.of(
                 VoltageInitBusModificationInfos.builder()
+                    .voltageLevelId("1")
                     .busId("B1")
                     .v(225.)
                     .angle(0.)
                     .build(),
                 VoltageInitBusModificationInfos.builder()
+                    .voltageLevelId("2")
                     .busId("B2")
                     .v(380.)
                     .angle(0.3)