Spring/spring-data-r2dbc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#244 - Add Reactor Checkpoint operator for SQL execution.

Browse Source 
We now integrate with Reactor's checkpoint operator to include more information for debugging.
This commit is contained in:
Mark Paluch
2019-12-02 11:12:59 +01:00
parent 86ce98d08d
commit 97ef1ed8b7
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClient.java
View File

@@ -386,7 +386,7 @@ class DefaultDatabaseClient implements DatabaseClient, ConnectionAccessor {
return statement; return statement;
}; };
Function<Connection, Flux<Result>> resultFunction = it -> Flux.from(executeFunction.apply(it).execute()); Function<Connection, Flux<Result>> resultFunction = toExecuteFunction(sql, executeFunction);
return new DefaultSqlResult<>(DefaultDatabaseClient.this, // return new DefaultSqlResult<>(DefaultDatabaseClient.this, //
sql, // sql, //
@@ -707,7 +707,7 @@ class DefaultDatabaseClient implements DatabaseClient, ConnectionAccessor {
String sql = getRequiredSql(preparedOperation); String sql = getRequiredSql(preparedOperation);
Function<Connection, Statement> selectFunction = wrapPreparedOperation(sql, preparedOperation); Function<Connection, Statement> selectFunction = wrapPreparedOperation(sql, preparedOperation);
Function<Connection, Flux<Result>> resultFunction = it -> Flux.from(selectFunction.apply(it).execute()); Function<Connection, Flux<Result>> resultFunction = DefaultDatabaseClient.toExecuteFunction(sql, selectFunction);
return new DefaultSqlResult<>(DefaultDatabaseClient.this, // return new DefaultSqlResult<>(DefaultDatabaseClient.this, //
sql, // sql, //
@@ -1377,7 +1377,7 @@ class DefaultDatabaseClient implements DatabaseClient, ConnectionAccessor {
String sql = getRequiredSql(operation); String sql = getRequiredSql(operation);
Function<Connection, Statement> insertFunction = wrapPreparedOperation(sql, operation) Function<Connection, Statement> insertFunction = wrapPreparedOperation(sql, operation)
.andThen(statement -> statement.returnGeneratedValues()); .andThen(statement -> statement.returnGeneratedValues());
Function<Connection, Flux<Result>> resultFunction = it -> Flux.from(insertFunction.apply(it).execute()); Function<Connection, Flux<Result>> resultFunction = toExecuteFunction(sql, insertFunction);
return new DefaultSqlResult<>(this, // return new DefaultSqlResult<>(this, //
sql, // sql, //
@@ -1390,7 +1390,7 @@ class DefaultDatabaseClient implements DatabaseClient, ConnectionAccessor {
String sql = getRequiredSql(operation); String sql = getRequiredSql(operation);
Function<Connection, Statement> executeFunction = wrapPreparedOperation(sql, operation); Function<Connection, Statement> executeFunction = wrapPreparedOperation(sql, operation);
Function<Connection, Flux<Result>> resultFunction = it -> Flux.from(executeFunction.apply(it).execute()); Function<Connection, Flux<Result>> resultFunction = toExecuteFunction(sql, executeFunction);
return new DefaultSqlResult<>(this, // return new DefaultSqlResult<>(this, //
sql, // sql, //
@@ -1421,6 +1421,16 @@ class DefaultDatabaseClient implements DatabaseClient, ConnectionAccessor {
}; };
} }
private static Function<Connection, Flux<Result>> toExecuteFunction(String sql,
Function<Connection, Statement> executeFunction) {
return it -> {
Flux<Result> from = Flux.defer(() -> executeFunction.apply(it).execute()).cast(Result.class);
return from.checkpoint("SQL \"" + sql + "\" [DatabaseClient]");
};
}
private static <T> Flux<T> doInConnectionMany(Connection connection, Function<Connection, Flux<T>> action) { private static <T> Flux<T> doInConnectionMany(Connection connection, Function<Connection, Flux<T>> action) {
try { try {