Skip to content

performance: use PreloadingStrategy.NONE with low numbers of substations #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: jorism/partial-load-on-bus-network-components
Choose a base branch
from
Open

performance: use PreloadingStrategy.NONE with low numbers of substations #290

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions src/main/java/org/gridsuite/network/map/services/NetworkMapService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;

import static org.gridsuite.network.map.dto.InfoTypeParameters.QUERY_PARAM_LOAD_NETWORK_COMPONENTS;

/**
* @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
Expand Down Expand Up @@ -62,7 +65,16 @@ private List<String> getSubstationsIds(UUID networkUuid, String variantId, List<
}

public AllElementsInfos getAllElementsInfos(UUID networkUuid, String variantId, @NonNull List<String> substationsId, Map<String, Map<String, String>> additionalParametersByType) {
Network network = getNetwork(networkUuid, PreloadingStrategy.ALL_COLLECTIONS_NEEDED_FOR_BUS_VIEW, variantId);
// With network components we have to traverse almost all the network to recompute so we can switch to
// ALL_COLLECTIONS_NEEDED_FOR_BUS_VIEW directly
boolean shouldLoadNetworkComponents = Optional.ofNullable(additionalParametersByType.get(ElementType.BUS.toString()))
.map(map -> map.get(QUERY_PARAM_LOAD_NETWORK_COMPONENTS))
.map(Boolean::valueOf)
.orElse(false);
PreloadingStrategy preloadingStrategy = shouldLoadNetworkComponents || substationsId.size() >= 5 ?
PreloadingStrategy.ALL_COLLECTIONS_NEEDED_FOR_BUS_VIEW :
PreloadingStrategy.NONE;
Network network = getNetwork(networkUuid, preloadingStrategy, variantId);
return AllElementsInfos.builder()
.substations(getSubstationsInfos(network, substationsId, getInfoTypeParameters(additionalParametersByType, ElementType.SUBSTATION), null))
.voltageLevels(getVoltageLevelsInfos(network, substationsId, getInfoTypeParameters(additionalParametersByType, ElementType.VOLTAGE_LEVEL), null))
Expand Down Expand Up @@ -253,10 +265,11 @@ private List<ElementInfos> getTieLinesInfos(Network network, @NonNull List<Strin

private List<ElementInfos> getBusesInfos(Network network, @NonNull List<String> substationsId, InfoTypeParameters infoTypeParameters) {
Stream<Bus> buses = substationsId.isEmpty() ? network.getBusView().getBusStream() :
network.getBusView().getBusStream()
.filter(Objects::nonNull)
.filter(bus -> bus.getVoltageLevel().getSubstation().stream().anyMatch(substation -> substationsId.contains(substation.getId())))
.distinct();
substationsId
.stream()
.flatMap(id -> network.getSubstation(id).getVoltageLevelStream())
.flatMap(vl -> StreamSupport.stream(vl.getBusView().getBuses().spliterator(), false));

return buses
.map(c -> ElementType.BUS.getInfosGetter().apply(c, infoTypeParameters))
.distinct()
Expand Down