github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#11467] LoggerListener should log batch sizes for BatchSingle

Browse Source 
and BatchMultiple
This commit is contained in:
Lukas Eder 2022-03-10 14:13:44 +01:00
parent e09de3888a
commit 78820cf2f5
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jOOQ/src/main/java/org/jooq/impl/BatchCRUD.java
View File

@ -176,7 +176,7 @@ final class BatchCRUD extends AbstractBatch {
return result;
}
private void executeAction(int i) {
private final void executeAction(int i) {
switch (action) {
case STORE:
((UpdatableRecord<?>) records[i]).store();

35
jOOQ/src/main/java/org/jooq/tools/LoggerListener.java
View File

@ -73,9 +73,10 @@ import org.jooq.impl.DefaultVisitListener;
*/
public class LoggerListener extends DefaultExecuteListener {
private static final JooqLogger log = JooqLogger.getLogger(LoggerListener.class);
private static final String BUFFER = "org.jooq.tools.LoggerListener.BUFFER";
private static final String DO_BUFFER = "org.jooq.tools.LoggerListener.DO_BUFFER";
private static final JooqLogger log = JooqLogger.getLogger(LoggerListener.class);
private static final String BUFFER = "org.jooq.tools.LoggerListener.BUFFER";
private static final String DO_BUFFER = "org.jooq.tools.LoggerListener.DO_BUFFER";
private static final String BATCH_SIZE = "org.jooq.tools.LoggerListener.BATCH_SIZE";
@Override
public void renderEnd(ExecuteContext ctx) {
@ -111,6 +112,14 @@ public class LoggerListener extends DefaultExecuteListener {
log.debug("-> with bind values", newline + inlined);
}
// [#2532] Log a complete BatchMultiple query
else if (ctx.type() == ExecuteType.BATCH
&& batchSQL.length > 0
&& batchSQL[batchSQL.length - 1] != null) {
for (String sql : batchSQL)
log.debug("Executing batch query", newline + sql);
}
else if (!StringUtils.isBlank(ctx.sql())) {
// [#1529] Batch queries should be logged specially
@ -119,16 +128,22 @@ public class LoggerListener extends DefaultExecuteListener {
else
log.debug("Executing query", newline + ctx.sql());
}
// [#2532] Log a complete BatchMultiple query
else if (batchSQL.length > 0) {
if (batchSQL[batchSQL.length - 1] != null)
for (String sql : batchSQL)
log.debug("Executing batch query", newline + sql);
}
}
}
@Override
public void bindEnd(ExecuteContext ctx) {
if (log.isDebugEnabled())
if (ctx.type() == ExecuteType.BATCH)
ctx.data().compute(BATCH_SIZE, (k, v) -> v == null ? 1 : ((int) v) + 1);
}
@Override
public void executeStart(ExecuteContext ctx) {
if (log.isDebugEnabled())
if (ctx.type() == ExecuteType.BATCH)
log.debug("Batch size", ctx.data().getOrDefault(BATCH_SIZE, ctx.batchSQL().length));
}
@SuppressWarnings("unchecked")
@Override