libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

Align code with H6 DefaultAutoFlushEventListener

Browse source 
This is taken from Version 6.1.6

Closes #16334
This commit is contained in:
Alexander Schwartz 2023-01-12 14:26:50 +01:00 committed by Václav Muzikář
parent 137a2bf0e9
commit 9d217d66a0
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/hibernate/listeners/JpaAutoFlushListener.java
View file

@ -20,10 +20,13 @@ package org.keycloak.models.map.storage.jpa.hibernate.listeners;
import org.hibernate.FlushMode;
import org.hibernate.HibernateException;
import org.hibernate.engine.spi.ActionQueue;
import org.hibernate.engine.spi.PersistenceContext;
import org.hibernate.engine.spi.SessionEventListenerManager;
import org.hibernate.event.internal.DefaultAutoFlushEventListener;
import org.hibernate.event.spi.AutoFlushEvent;
import org.hibernate.event.spi.EventSource;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.stat.spi.StatisticsImplementor;
import org.jboss.logging.Logger;
import org.keycloak.models.map.storage.jpa.JpaMapStorage;
@ -45,8 +48,9 @@ public class JpaAutoFlushListener extends DefaultAutoFlushEventListener {
public void onAutoFlush(AutoFlushEvent event) throws HibernateException {
final EventSource source = event.getSession();
final SessionEventListenerManager eventListenerManager = source.getEventListenerManager();
try {
source.getEventListenerManager().partialFlushStart();
eventListenerManager.partialFlushStart();
if (flushMightBeNeeded(source)) {
// Need to get the number of collection removals before flushing to executions
@ -65,17 +69,18 @@ public class JpaAutoFlushListener extends DefaultAutoFlushEventListener {
postPostFlush(source);
if (source.getFactory().getStatistics().isStatisticsEnabled()) {
source.getFactory().getStatistics().flush();
final StatisticsImplementor statistics = source.getFactory().getStatistics();
if (statistics.isStatisticsEnabled()) {
statistics.flush();
}
} else {
LOG.trace("Don't need to execute flush");
LOG.trace("No need to execute flush");
event.setFlushRequired(false);
actionQueue.clearFromFlushNeededCheck(oldSize);
}
}
} finally {
source.getEventListenerManager().partialFlushEnd(
eventListenerManager.partialFlushEnd(
event.getNumberOfEntitiesProcessed(),
event.getNumberOfEntitiesProcessed()
);
@ -84,23 +89,24 @@ public class JpaAutoFlushListener extends DefaultAutoFlushEventListener {
private boolean flushIsReallyNeeded(AutoFlushEvent event, final EventSource source) {
boolean flushIsReallyNeeded = source.getHibernateFlushMode() == FlushMode.ALWAYS
// START OF FIX for auto-flush-mode on inserts that might later be deleted in same transaction
// START OF FIX for auto-flush-mode on inserts that might later be deleted in the same transaction
|| source.getActionQueue().numberOfInsertions() > 0
// END OF FIX
|| source.getActionQueue().areTablesToBeUpdated(event.getQuerySpaces());
// START OF HOOK: clear query cache when data is flushed to the database
if (flushIsReallyNeeded) {
// clear the per-session query cache, as changing an entity might change any of the cached query results
JpaMapStorage.clearQueryCache(source.getSession());
}
// END OF HOOK
return flushIsReallyNeeded;
}
private boolean flushMightBeNeeded(final EventSource source) {
final PersistenceContext persistenceContext = source.getPersistenceContextInternal();
return !source.getHibernateFlushMode().lessThan(FlushMode.AUTO)
// getDontFLushFromFind removed in hibernate 6s
// && source.getDontFlushFromFind() == 0
&& (source.getPersistenceContext().getNumberOfManagedEntities() > 0 ||
source.getPersistenceContext().getCollectionEntriesSize() > 0);
&& (persistenceContext.getNumberOfManagedEntities() > 0
|| persistenceContext.getCollectionEntriesSize() > 0);
}
}