Skip to content
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

[WIP] Proposal to fix typing #26

Closed
wants to merge 1 commit into from
Closed

[WIP] Proposal to fix typing #26

Show file tree
Hide file tree
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
8 changes: 5 additions & 3 deletions ...k-store-server/src/main/java/com/powsybl/network/store/server/NetworkStoreRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,12 @@
import javax.sql.DataSource;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.sql.*;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.time.Instant;
import java.util.*;
import java.util.Date;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -698,7 +700,7 @@ public <T extends IdentifiableAttributes & Contained> void updateIdentifiables(U
try (var connection = dataSource.getConnection()) {
for (List<Resource<T>> subResources : Lists.partition(resources, BATCH_SIZE)) {
List<Object> values = new ArrayList<>(4 + tableMapping.getColumnsMapping().size());
try (PreparedStatement preparedStmt = connection.prepareStatement(QueryCatalog.buildMultiRowsUpdateIdentifiableQuery(tableMapping.getTable(), tableMapping.getColumnsMapping().keySet(), columnToAddToWhereClause, subResources.size()))) {
try (PreparedStatement preparedStmt = connection.prepareStatement(QueryCatalog.buildMultiRowsUpdateIdentifiableQuery(tableMapping.getTable(), tableMapping.getColumnsMapping(), columnToAddToWhereClause, subResources.size()))) {
for (Resource<T> resource : subResources) {
T attributes = resource.getAttributes();
for (var e : tableMapping.getColumnsMapping().entrySet()) {
Expand Down
33 changes: 24 additions & 9 deletions network-store-server/src/main/java/com/powsybl/network/store/server/QueryCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@

import com.powsybl.network.store.model.Resource;

import java.util.*;
import java.util.Collection;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

import static com.powsybl.network.store.server.Mappings.*;
Expand Down Expand Up @@ -178,7 +180,8 @@ public static String buildUpdateIdentifiableQuery(String tableName, Collection<S
return query.toString();
}

public static String buildMultiRowsUpdateIdentifiableQuery(String tableName, Set<String> columns, String columnToAddToWhereClause, int rowsNumber) {
public static String buildMultiRowsUpdateIdentifiableQuery(String tableName, Map<String, ColumnMapping> columnMapping, String columnToAddToWhereClause, int rowsNumber) {
Set<String> columns = columnMapping.keySet();
StringBuilder query = new StringBuilder("update ")
.append(tableName + " as T1 \n")
.append(" set \n");
Expand All @@ -198,17 +201,29 @@ public static String buildMultiRowsUpdateIdentifiableQuery(String tableName, Set
query.append(" FROM (VALUES \n");
for (int i = 0; i < rowsNumber; i++) {
query.append("(");
query.append("?, ");
query.append("?, ");
query.append("?, ");
it = columns.iterator();
while (it.hasNext()) {
it.next();
query.append("?");
if (it.hasNext()) {
query.append(", ");
String column = it.next();
if (!column.equalsIgnoreCase(columnToAddToWhereClause)) {
Class<?> columnType = columnMapping.get(column).getClassR();
if (columnType == Double.class) {
query.append("?::double precision");
} else if (columnType == Boolean.class) {
query.append("?::boolean");
} else {
query.append("?");
}
if (it.hasNext()) {
query.append(", ");
}
}
}
query.append(", ?");
query.append(", ?");
query.append(", ?");
if (columnToAddToWhereClause != null) {
query.append(", ?");
}
query.append(")");
if (i < rowsNumber - 1) {
query.append(",\n");
Expand Down
Loading