Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions model/jpa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,17 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<!-- Standalone ORM bootstrap in lifecycle tests needs the accessor excluded by Quarkus. -->
<dependency>
<groupId>org.hibernate.accessor</groupId>
<artifactId>hibernate-accessor-bytebuddy</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.narayana.jta</groupId>
<artifactId>narayana-jta</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
import org.hibernate.dialect.OracleDialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.dialect.SQLServerDialect;
import org.hibernate.engine.internal.TransactionCompletionCallbacksImpl;
import org.hibernate.engine.spi.ActionQueue;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.event.spi.EventType;
Expand All @@ -40,7 +38,6 @@
import org.hibernate.event.spi.PreInsertEventListener;
import org.hibernate.event.spi.PreUpdateEvent;
import org.hibernate.event.spi.PreUpdateEventListener;
import org.hibernate.internal.SessionImpl;
import org.jboss.logging.Logger;

/**
Expand Down Expand Up @@ -173,21 +170,6 @@ private void handleEntity(Object entity, SharedSessionContractImplementor sessio
}
}
);
// Workaround for https://hibernate.atlassian.net/browse/HHH-20863:
// On rollback, beforeTransactionCompletion() is never called, so the BeforeCompletionCallback
// above remains in the ActionQueue and triggers HHH90010101 during em.close().
// Clear it on rollback via an AfterCompletionCallback.
session.getTransactionCompletionCallbacks().registerCallback(
(boolean success, SharedSessionContractImplementor sess) -> {
if (!success && sess instanceof SessionImpl si) {
ActionQueue aq = si.getActionQueue();
if (aq.hasBeforeTransactionActions()) {
aq.setTransactionCompletionCallbacks(
new TransactionCompletionCallbacksImpl(si), false);
}
}
}
);
}

if (entity instanceof AsynchronousCommitAllowed asyncEntity) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
package org.keycloak.connections.jpa;

import java.sql.Connection;
import java.util.Arrays;
import java.util.Collection;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;

import jakarta.persistence.Entity;
import jakarta.persistence.Id;

import com.arjuna.ats.jta.TransactionManager;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.boot.MetadataSources;
import org.hibernate.boot.registry.StandardServiceRegistry;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.event.spi.EventSource;
import org.hibernate.event.spi.EventType;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;

@RunWith(Parameterized.class)
public class AsyncCommitIntegratorTest {

@Parameterized.Parameters(name = "queue={0}, transactions={1}")
public static Collection<Object[]> queues() {
return Arrays.asList(new Object[][] {
{ "graph", "jdbc" }, { "legacy", "jdbc" }, { "graph", "jta" }, { "legacy", "jta" }
});
}

@Parameterized.Parameter
public String queue;

@Parameterized.Parameter(1)
public String transactions;

private final AtomicInteger asyncCommits = new AtomicInteger();
private StandardServiceRegistry registry;
private SessionFactory sessionFactory;

@Before
public void createSessionFactory() {
registry = new StandardServiceRegistryBuilder()
.applySetting("hibernate.connection.driver_class", "org.h2.Driver")
.applySetting("hibernate.connection.url", "jdbc:h2:mem:" + UUID.randomUUID())
.applySetting("hibernate.hbm2ddl.auto", "create-drop")
.applySetting("hibernate.flush.queue.type", queue)
.applySetting("hibernate.transaction.coordinator_class", transactions)
.applySetting("hibernate.transaction.jta.platform", transactions.equals("jta")
? "org.hibernate.engine.transaction.jta.platform.internal.NarayanaJtaPlatform"
: "org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform")
.build();
sessionFactory = new MetadataSources(registry)
.addAnnotatedClass(AsyncEntity.class)
.addAnnotatedClass(SyncEntity.class)
.buildMetadata().buildSessionFactory();
AsyncCommitIntegrator integrator = new AsyncCommitIntegrator() {
@Override
protected boolean isEnabled(SessionFactoryImplementor sf) {
return true;
}

@Override
protected void applyAsyncCommit(Connection connection) {
asyncCommits.incrementAndGet();
}
};
sessionFactory.unwrap(SessionFactoryImplementor.class).getEventEngine().getListenerRegistry()
.appendListeners(EventType.PRE_INSERT, integrator);
}

@After
public void closeSessionFactory() throws Exception {
try {
if (transactions.equals("jta")) {
var transactionManager = TransactionManager.transactionManager();
if (transactionManager.getTransaction() != null) {
transactionManager.rollback();
}
}
} finally {
if (sessionFactory != null) {
sessionFactory.close();
}
if (registry != null) {
StandardServiceRegistryBuilder.destroy(registry);
}
}
}

@Test
public void commitRunsCallbackOnce() {
try (Session session = sessionFactory.openSession()) {
session.beginTransaction();
session.persist(new AsyncEntity(1));
session.flush();
session.persist(new AsyncEntity(2));
session.getTransaction().commit();
}
assertEquals(1, asyncCommits.get());
}

@Test
public void rollbackDoesNotRunCallback() {
try (Session session = sessionFactory.openSession()) {
session.beginTransaction();
session.persist(new AsyncEntity(1));
session.flush();
session.getTransaction().rollback();
assertFalse("Rollback must clear before-completion callbacks",
session.unwrap(EventSource.class).getActionQueue().hasBeforeTransactionActions());
assertEquals(0, asyncCommits.get());
}
assertEquals(0, asyncCommits.get());

try (Session session = sessionFactory.openSession()) {
session.beginTransaction();
session.persist(new AsyncEntity(2));
session.getTransaction().commit();
}
assertEquals(1, asyncCommits.get());
}

@Test
public void mixedChangesRequireSynchronousCommit() {
try (Session session = sessionFactory.openSession()) {
session.beginTransaction();
session.persist(new AsyncEntity(1));
session.flush();
session.persist(new SyncEntity(2));
session.getTransaction().commit();
}
assertEquals(0, asyncCommits.get());
}

@Entity(name = "AsyncCommitTestAsyncEntity")
public static class AsyncEntity implements AsynchronousCommitAllowed {
@Id
private int id;

public AsyncEntity() {
}

public AsyncEntity(int id) {
this.id = id;
}

@Override
public boolean isAsyncCommitAllowed(EntityOperationType operationType) {
return true;
}
}

@Entity(name = "AsyncCommitTestSyncEntity")
public static class SyncEntity {
@Id
private int id;

public SyncEntity() {
}

public SyncEntity(int id) {
this.id = id;
}
}
}
Loading