Skip to content

Commit b1fe907

Browse files
committed
Fix latest ORM 6.2 SNAPSHOT compilation errors
* A parameter type has changed: from `Supplier<BatchKey>` to `BatchKeyAccess`
1 parent b5c8fe7 commit b1fe907

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/jdbc/mutation/internal/ReactiveMutationExecutorStandard.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@
77

88
import java.sql.SQLException;
99
import java.util.concurrent.CompletionStage;
10-
import java.util.function.Supplier;
1110

12-
import org.hibernate.engine.jdbc.batch.spi.BatchKey;
1311
import org.hibernate.engine.jdbc.mutation.JdbcValueBindings;
1412
import org.hibernate.engine.jdbc.mutation.OperationResultChecker;
1513
import org.hibernate.engine.jdbc.mutation.TableInclusionChecker;
1614
import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails;
1715
import org.hibernate.engine.jdbc.mutation.group.PreparedStatementGroup;
1816
import org.hibernate.engine.jdbc.mutation.internal.MutationExecutorStandard;
17+
import org.hibernate.engine.jdbc.mutation.spi.BatchKeyAccess;
1918
import org.hibernate.engine.spi.SharedSessionContractImplementor;
2019
import org.hibernate.reactive.adaptor.impl.PrepareStatementDetailsAdaptor;
2120
import org.hibernate.reactive.adaptor.impl.PreparedStatementAdaptor;
@@ -39,7 +38,7 @@ public class ReactiveMutationExecutorStandard extends MutationExecutorStandard i
3938

4039
public ReactiveMutationExecutorStandard(
4140
MutationOperationGroup mutationOperationGroup,
42-
Supplier<BatchKey> batchKeySupplier,
41+
BatchKeyAccess batchKeySupplier,
4342
int batchSize,
4443
SharedSessionContractImplementor session) {
4544
super( mutationOperationGroup, batchKeySupplier, batchSize, session );

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/collection/mutation/ReactiveUpdateRowsCoordinatorOneToMany.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@
88
import java.lang.invoke.MethodHandles;
99
import java.util.Iterator;
1010
import java.util.concurrent.CompletionStage;
11-
import java.util.function.Supplier;
1211

1312
import org.hibernate.collection.spi.PersistentCollection;
1413
import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey;
15-
import org.hibernate.engine.jdbc.batch.spi.BatchKey;
1614
import org.hibernate.engine.jdbc.mutation.JdbcValueBindings;
15+
import org.hibernate.engine.jdbc.mutation.spi.BatchKeyAccess;
1716
import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService;
1817
import org.hibernate.engine.spi.SessionFactoryImplementor;
1918
import org.hibernate.engine.spi.SharedSessionContractImplementor;
@@ -151,7 +150,7 @@ private CompletionStage<Void> deleteRows(
151150
.thenCompose( CompletionStages::voidFuture );
152151
}
153152

154-
private ReactiveMutationExecutor reactiveMutationExecutor(SharedSessionContractImplementor session, MutationOperationGroupSingle operationGroup, Supplier<BatchKey> batchKeySupplier) {
153+
private ReactiveMutationExecutor reactiveMutationExecutor(SharedSessionContractImplementor session, MutationOperationGroupSingle operationGroup, BatchKeyAccess batchKeySupplier) {
155154
final MutationExecutorService mutationExecutorService = session
156155
.getFactory()
157156
.getServiceRegistry()

hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/exec/internal/ReactiveStandardMutationExecutorService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
package org.hibernate.reactive.sql.exec.internal;
77

88
import java.util.Map;
9-
import java.util.function.Supplier;
109

1110
import org.hibernate.cfg.Environment;
1211
import org.hibernate.engine.jdbc.batch.spi.BatchKey;
1312
import org.hibernate.engine.jdbc.mutation.MutationExecutor;
13+
import org.hibernate.engine.jdbc.mutation.spi.BatchKeyAccess;
1414
import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService;
1515
import org.hibernate.engine.spi.SharedSessionContractImplementor;
1616
import org.hibernate.internal.util.config.ConfigurationHelper;
@@ -47,7 +47,7 @@ public ReactiveStandardMutationExecutorService(int globalBatchSize) {
4747
//FIXME: It would be nice to have a factory to pass to the ORM method
4848
@Override
4949
public MutationExecutor createExecutor(
50-
Supplier<BatchKey> batchKeySupplier,
50+
BatchKeyAccess batchKeySupplier,
5151
MutationOperationGroup operationGroup,
5252
SharedSessionContractImplementor session) {
5353
// decide whether to use batching - any number > one means to batch
@@ -81,7 +81,7 @@ public MutationExecutor createExecutor(
8181
}
8282

8383
final PreparableMutationOperation jdbcOperation = (PreparableMutationOperation) singleOperation;
84-
final BatchKey batchKey = batchKeySupplier.get();
84+
final BatchKey batchKey = batchKeySupplier.getBatchKey();
8585
if ( jdbcOperation.canBeBatched( batchKey, batchSizeToUse ) ) {
8686
return new ReactiveMutationExecutorSingleBatched( jdbcOperation, batchKey, batchSizeToUse, session );
8787
}

0 commit comments

Comments
 (0)