From 5d6e9a1fdb6405c2a31c5b04814e36d8ab05624b Mon Sep 17 00:00:00 2001 From: Nathan Xu Date: Fri, 6 May 2022 22:24:49 -0400 Subject: [PATCH] HHH-15255 fix org.hibernate.orm.test.batch.BatchTest --- .../org/hibernate/engine/jdbc/batch/internal/BatchingBatch.java | 2 -- .../src/test/java/org/hibernate/orm/test/batch/BatchTest.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchingBatch.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchingBatch.java index 5ff1fc9b4d..ab3868509d 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchingBatch.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchingBatch.java @@ -30,8 +30,6 @@ public class BatchingBatch extends AbstractBatchImpl { BatchingBatch.class.getName() ); - // IMPL NOTE : Until HHH-5797 is fixed, there will only be 1 statement in a batch - private int batchSize; private final int configuredBatchSize; private int batchPosition; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTest.java index fbfc6efaf4..9e4623cd8f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTest.java @@ -80,7 +80,7 @@ public void doBatchInsertUpdate(int nEntities, int nBeforeFlush) { dp.setX( new BigDecimal( i * 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); s.save( dp ); - if ( i + 1 % nBeforeFlush == 0 ) { + if ( ( i + 1 ) % nBeforeFlush == 0 ) { s.flush(); s.clear(); }