Do not compute persistent state for immutable entities and do not do …

…dirty check
flowable · Nov 1, 2024 · 1afc288 · 1afc288
1 parent 83098a5
commit 1afc288
Show file tree

Hide file tree

Showing 14 changed files with 58 additions and 95 deletions.
diff --git a/.../flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/CmmnEngineConfiguration.java b/.../flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/CmmnEngineConfiguration.java
@@ -1440,7 +1440,7 @@ public InputStream getMyBatisXmlConfigurationStream() {
 
     @Override
     protected void initDbSqlSessionFactoryEntitySettings() {
-        defaultInitDbSqlSessionFactoryEntitySettings(EntityDependencyOrder.INSERT_ORDER, EntityDependencyOrder.DELETE_ORDER);
+        defaultInitDbSqlSessionFactoryEntitySettings(EntityDependencyOrder.INSERT_ORDER, EntityDependencyOrder.DELETE_ORDER, EntityDependencyOrder.IMMUTABLE_ENTITIES);
 
         // Oracle doesn't support bulk inserting for historic task log entries
         if (isBulkInsertEnabled && "oracle".equals(databaseType)) {

diff --git a/...ble-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/db/EntityDependencyOrder.java b/...ble-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/db/EntityDependencyOrder.java
@@ -13,6 +13,7 @@
 package org.flowable.cmmn.engine.impl.db;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -59,6 +60,7 @@ public class EntityDependencyOrder {
 
     public static List<Class<? extends Entity>> DELETE_ORDER = new ArrayList<>();
     public static List<Class<? extends Entity>> INSERT_ORDER;
+    public static Collection<Class<? extends Entity>> IMMUTABLE_ENTITIES = new ArrayList<>();
 
     static {
 
@@ -100,6 +102,10 @@ public class EntityDependencyOrder {
         INSERT_ORDER = new ArrayList<>(DELETE_ORDER);
         Collections.reverse(INSERT_ORDER);
 
+        IMMUTABLE_ENTITIES.add(EntityLinkEntityImpl.class);
+        IMMUTABLE_ENTITIES.add(HistoricEntityLinkEntityImpl.class);
+        IMMUTABLE_ENTITIES.add(HistoricIdentityLinkEntityImpl.class);
+
     }
 
 }
diff --git a/...ine-common/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfiguration.java b/...ine-common/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfiguration.java
@@ -802,6 +802,10 @@ public DbSqlSessionFactory createDbSqlSessionFactory() {
     protected abstract void initDbSqlSessionFactoryEntitySettings();
 
     protected void defaultInitDbSqlSessionFactoryEntitySettings(List<Class<? extends Entity>> insertOrder, List<Class<? extends Entity>> deleteOrder) {
+        defaultInitDbSqlSessionFactoryEntitySettings(insertOrder, deleteOrder, Collections.emptyList());
+    }
+
+    protected void defaultInitDbSqlSessionFactoryEntitySettings(List<Class<? extends Entity>> insertOrder, List<Class<? extends Entity>> deleteOrder, Collection<Class<? extends Entity>> immutableEntities) {
         if (insertOrder != null) {
             for (Class<? extends Entity> clazz : insertOrder) {
                 dbSqlSessionFactory.getInsertionOrder().add(clazz);
@@ -817,6 +821,10 @@ protected void defaultInitDbSqlSessionFactoryEntitySettings(List<Class<? extends
                 dbSqlSessionFactory.getDeletionOrder().add(clazz);
             }
         }
+
+        if (immutableEntities != null && !immutableEntities.isEmpty()) {
+            dbSqlSessionFactory.getImmutableEntities().addAll(immutableEntities);
+        }
     }
 
     public void initTransactionFactory() {

diff --git a/...flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/DbSqlSession.java b/...flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/DbSqlSession.java
@@ -413,7 +413,15 @@ protected void removeUnnecessaryOperations() {
     public void determineUpdatedObjects() {
         updatedObjects = new ArrayList<>();
         Map<Class<?>, Map<String, CachedEntity>> cachedObjects = entityCache.getAllCachedEntities();
+        if (cachedObjects.isEmpty()) {
+            return;
+        }
+
+        Collection<Class<? extends Entity>> immutableEntities = dbSqlSessionFactory.getImmutableEntities();
         for (Class<?> clazz : cachedObjects.keySet()) {
+            if (immutableEntities.contains(clazz)) {
+                continue;
+            }
 
             Map<String, CachedEntity> classCache = cachedObjects.get(clazz);
             for (CachedEntity cachedObject : classCache.values()) {

diff --git a/...e-engine-common/src/main/java/org/flowable/common/engine/impl/db/DbSqlSessionFactory.java b/...e-engine-common/src/main/java/org/flowable/common/engine/impl/db/DbSqlSessionFactory.java
@@ -15,6 +15,7 @@
 
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -55,6 +56,7 @@ public class DbSqlSessionFactory implements SessionFactory {
 
     protected List<Class<? extends Entity>> insertionOrder = new ArrayList<>();
     protected List<Class<? extends Entity>> deletionOrder = new ArrayList<>();
+    protected Collection<Class<? extends Entity>> immutableEntities = new HashSet<>();
 
     protected boolean isDbHistoryUsed = true;
 
@@ -327,6 +329,15 @@ public List<Class<? extends Entity>> getDeletionOrder() {
     public void setDeletionOrder(List<Class<? extends Entity>> deletionOrder) {
         this.deletionOrder = deletionOrder;
     }
+
+    public Collection<Class<? extends Entity>> getImmutableEntities() {
+        return immutableEntities;
+    }
+
+    public void setImmutableEntities(Collection<Class<? extends Entity>> immutableEntities) {
+        this.immutableEntities = immutableEntities;
+    }
+
     public void addLogicalEntityClassMapping(String logicalName, Class<?> entityClass) {
         logicalNameToClassMapping.put(logicalName, entityClass);
     }

diff --git a/...ble-engine/src/main/java/org/flowable/engine/impl/cfg/ProcessEngineConfigurationImpl.java b/...ble-engine/src/main/java/org/flowable/engine/impl/cfg/ProcessEngineConfigurationImpl.java
@@ -1397,7 +1397,7 @@ public void initSessionFactories() {
 
     @Override
     protected void initDbSqlSessionFactoryEntitySettings() {
-        defaultInitDbSqlSessionFactoryEntitySettings(EntityDependencyOrder.INSERT_ORDER, EntityDependencyOrder.DELETE_ORDER);
+        defaultInitDbSqlSessionFactoryEntitySettings(EntityDependencyOrder.INSERT_ORDER, EntityDependencyOrder.DELETE_ORDER, EntityDependencyOrder.IMMUTABLE_ENTITIES);
 
         // Oracle doesn't support bulk inserting for event log entries and historic task log entries
         if (isBulkInsertEnabled && "oracle".equals(databaseType)) {

diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/db/EntityDependencyOrder.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/db/EntityDependencyOrder.java
@@ -13,6 +13,7 @@
 package org.flowable.engine.impl.db;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -66,6 +67,7 @@ public class EntityDependencyOrder {
 
     public static List<Class<? extends Entity>> DELETE_ORDER = new ArrayList<>();
     public static List<Class<? extends Entity>> INSERT_ORDER;
+    public static Collection<Class<? extends Entity>> IMMUTABLE_ENTITIES = new ArrayList<>();
 
     static {
 
@@ -222,6 +224,10 @@ public class EntityDependencyOrder {
         INSERT_ORDER = new ArrayList<>(DELETE_ORDER);
         Collections.reverse(INSERT_ORDER);
 
+        IMMUTABLE_ENTITIES.add(EntityLinkEntityImpl.class);
+        IMMUTABLE_ENTITIES.add(HistoricEntityLinkEntityImpl.class);
+        IMMUTABLE_ENTITIES.add(HistoricIdentityLinkEntityImpl.class);
+
     }
 
 }
diff --git a/...in/java/org/flowable/entitylink/service/impl/persistence/entity/EntityLinkEntityImpl.java b/...in/java/org/flowable/entitylink/service/impl/persistence/entity/EntityLinkEntityImpl.java
@@ -14,8 +14,6 @@
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * @author Tijs Rademakers
@@ -44,21 +42,8 @@ public EntityLinkEntityImpl() {
 
     @Override
     public Object getPersistentState() {
-        Map<String, Object> persistentState = new HashMap<>();
-        persistentState.put("linkType", this.linkType);
-        persistentState.put("scopeId", this.scopeId);
-        persistentState.put("subScopeId", this.subScopeId);
-        persistentState.put("scopeType", this.scopeType);
-        persistentState.put("scopeDefinitionId", this.scopeDefinitionId);
-        persistentState.put("parentElementId", this.parentElementId);
-        persistentState.put("referenceScopeId", this.referenceScopeId);
-        persistentState.put("referenceScopeType", this.referenceScopeType);
-        persistentState.put("referenceScopeDefinitionId", this.referenceScopeDefinitionId);
-        persistentState.put("rootScopeId", this.rootScopeId);
-        persistentState.put("rootScopeType", this.rootScopeType);
-        persistentState.put("hierarchyType", this.hierarchyType);
-
-        return persistentState;
+        // Entity link is immutable
+        return EntityLinkEntityImpl.class;
     }
 
     @Override

diff --git a/...org/flowable/entitylink/service/impl/persistence/entity/HistoricEntityLinkEntityImpl.java b/...org/flowable/entitylink/service/impl/persistence/entity/HistoricEntityLinkEntityImpl.java
@@ -14,8 +14,6 @@
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * @author Tijs Rademakers
@@ -44,23 +42,8 @@ public HistoricEntityLinkEntityImpl() {
 
     @Override
     public Object getPersistentState() {
-        Map<String, Object> persistentState = new HashMap<>();
-        persistentState.put("id", this.id);
-        persistentState.put("linkType", this.linkType);
-        persistentState.put("scopeId", this.scopeId);
-        persistentState.put("subScopeId", this.subScopeId);
-        persistentState.put("scopeType", this.scopeType);
-        persistentState.put("scopeDefinitionId", this.scopeDefinitionId);
-        persistentState.put("parentElementId", this.parentElementId);
-        persistentState.put("referenceScopeId", this.referenceScopeId);
-        persistentState.put("referenceScopeType", this.referenceScopeType);
-        persistentState.put("referenceScopeDefinitionId", this.referenceScopeDefinitionId);
-        persistentState.put("rootScopeId", this.rootScopeId);
-        persistentState.put("rootScopeType", this.rootScopeType);
-        persistentState.put("hierarchyType", this.hierarchyType);
-        persistentState.put("createTime", this.createTime);
-
-        return persistentState;
+        // Historic entity link is immutable
+        return HistoricEntityLinkEntityImpl.class;
     }
 
     @Override

diff --git a/...flowable/identitylink/service/impl/persistence/entity/HistoricIdentityLinkEntityImpl.java b/...flowable/identitylink/service/impl/persistence/entity/HistoricIdentityLinkEntityImpl.java
@@ -14,8 +14,6 @@
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 
 import org.flowable.common.engine.api.FlowableException;
 
@@ -43,47 +41,8 @@ public HistoricIdentityLinkEntityImpl() {
 
     @Override
     public Object getPersistentState() {
-        Map<String, Object> persistentState = new HashMap<>();
-        persistentState.put("id", this.id);
-        persistentState.put("type", this.type);
-
-        if (this.userId != null) {
-            persistentState.put("userId", this.userId);
-        }
-
-        if (this.groupId != null) {
-            persistentState.put("groupId", this.groupId);
-        }
-
-        if (this.taskId != null) {
-            persistentState.put("taskId", this.taskId);
-        }
-
-        if (this.processInstanceId != null) {
-            persistentState.put("processInstanceId", this.processInstanceId);
-        }
-
-        if (this.scopeId != null) {
-            persistentState.put("scopeId", this.scopeId);
-        }
-
-        if (this.subScopeId != null) {
-            persistentState.put("subScopeId", this.subScopeId);
-        }
-
-        if (this.scopeType!= null) {
-            persistentState.put("scopeType", this.scopeType);
-        }
-
-        if (this.scopeDefinitionId != null) {
-            persistentState.put("scopeDefinitionId", this.scopeDefinitionId);
-        }
-
-        if (this.createTime != null) {
-            persistentState.put("createTime", this.createTime);
-        }
-
-        return persistentState;
+        // Historic identity link is immutable
+        return HistoricIdentityLinkEntityImpl.class;
     }
 
     @Override

diff --git a/...les/flowable-idm-engine/src/main/java/org/flowable/idm/engine/IdmEngineConfiguration.java b/...les/flowable-idm-engine/src/main/java/org/flowable/idm/engine/IdmEngineConfiguration.java
@@ -315,7 +315,7 @@ public DbSqlSessionFactory createDbSqlSessionFactory() {
 
     @Override
     protected void initDbSqlSessionFactoryEntitySettings() {
-        defaultInitDbSqlSessionFactoryEntitySettings(EntityDependencyOrder.INSERT_ORDER, EntityDependencyOrder.DELETE_ORDER);
+        defaultInitDbSqlSessionFactoryEntitySettings(EntityDependencyOrder.INSERT_ORDER, EntityDependencyOrder.DELETE_ORDER, EntityDependencyOrder.IMMUTABLE_ENTITIES);
     }
 
     public void initPasswordEncoder() {

diff --git a/...wable-idm-engine/src/main/java/org/flowable/idm/engine/impl/db/EntityDependencyOrder.java b/...wable-idm-engine/src/main/java/org/flowable/idm/engine/impl/db/EntityDependencyOrder.java
@@ -13,6 +13,7 @@
 package org.flowable.idm.engine.impl.db;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -32,6 +33,7 @@ public class EntityDependencyOrder {
 
     public static List<Class<? extends Entity>> DELETE_ORDER = new ArrayList<>();
     public static List<Class<? extends Entity>> INSERT_ORDER = new ArrayList<>();
+    public static Collection<Class<? extends Entity>> IMMUTABLE_ENTITIES = new ArrayList<>();
 
     static {
 
@@ -49,6 +51,10 @@ public class EntityDependencyOrder {
         INSERT_ORDER = new ArrayList<>(DELETE_ORDER);
         Collections.reverse(INSERT_ORDER);
 
+        IMMUTABLE_ENTITIES.add(MembershipEntityImpl.class);
+        IMMUTABLE_ENTITIES.add(PrivilegeEntityImpl.class);
+        IMMUTABLE_ENTITIES.add(PrivilegeMappingEntityImpl.class);
+
     }
 
 }
diff --git a/...ne/src/main/java/org/flowable/idm/engine/impl/persistence/entity/PrivilegeEntityImpl.java b/...ne/src/main/java/org/flowable/idm/engine/impl/persistence/entity/PrivilegeEntityImpl.java
@@ -12,19 +12,14 @@
  */
 package org.flowable.idm.engine.impl.persistence.entity;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class PrivilegeEntityImpl extends AbstractIdmEngineEntity implements PrivilegeEntity {
 
     protected String name;
 
     @Override
     public Object getPersistentState() {
-        Map<String, String> state = new HashMap<>();
-        state.put("id", id);
-        state.put("name", name);
-        return state;
+        // Privilege is immutable
+        return PrivilegeEntityImpl.class;
     }
 
     @Override

diff --git a/...main/java/org/flowable/idm/engine/impl/persistence/entity/PrivilegeMappingEntityImpl.java b/...main/java/org/flowable/idm/engine/impl/persistence/entity/PrivilegeMappingEntityImpl.java
@@ -23,12 +23,8 @@ public class PrivilegeMappingEntityImpl extends AbstractIdmEngineEntity implemen
 
     @Override
     public Object getPersistentState() {
-        Map<String, String> state = new HashMap<>();
-        state.put("id", id);
-        state.put("privilegeId", privilegeId);
-        state.put("userId", userId);
-        state.put("groupId", groupId);
-        return state;
+        // Privilege mapping is immutable
+        return PrivilegeMappingEntityImpl.class;
     }
 
     @Override