[JBPM-10224] Missing index 'IDX_EventTypes_IdElement' with hibernate (#…

…2395) (#2409) * [JBPM-10224] Missing index 'IDX_EventTypes_IdElement' with hibernate.hbm2ddl.auto=update * [JBPM-10224] Align ddl-scripts for mysql5 and mysqlinnodb with creation of index 'IDX_EventTypes_IdElement' * [JBPM-10224] Align ddl-scripts for mysql5 and mysqlinnodb with creation of index 'IDX_EventTypes_Id' Co-authored-by: Daniele Mams <[email protected]>
kiegroup · Jul 4, 2024 · 3c3cf57 · 3c3cf57
1 parent 462defc
commit 3c3cf57
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 9 deletions.
diff --git a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/mysql5/mysql5-jbpm-schema.sql b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/mysql5/mysql5-jbpm-schema.sql
@@ -769,8 +769,8 @@
     create index IDX_TaskEvent_taskId on TaskEvent (taskId);
     create index IDX_TaskEvent_processInstanceId on TaskEvent (processInstanceId);
 
-    create index IDX_EventTypes_element ON EventTypes(element);
-    create index IDX_EventTypes_compound ON EventTypes(InstanceId, element);
+    create index IDX_EventTypes_Id ON EventTypes(InstanceId);
+    create index IDX_EventTypes_IdElement ON EventTypes(InstanceId, element);
 
     create index IDX_CMI_Context ON ContextMappingInfo(CONTEXT_ID);    
     create index IDX_CMI_KSession ON ContextMappingInfo(KSESSION_ID);    

diff --git a/...cripts/src/main/resources/db/ddl-scripts/mysqlinnodb/mysql-innodb-cluster-jbpm-schema.sql b/...cripts/src/main/resources/db/ddl-scripts/mysqlinnodb/mysql-innodb-cluster-jbpm-schema.sql
@@ -788,8 +788,8 @@
     create index IDX_TaskEvent_taskId on TaskEvent (taskId);
     create index IDX_TaskEvent_processInstanceId on TaskEvent (processInstanceId);
 
-    create index IDX_EventTypes_element ON EventTypes(element);
-    create index IDX_EventTypes_compound ON EventTypes(InstanceId, element);
+    create index IDX_EventTypes_Id ON EventTypes(InstanceId);
+    create index IDX_EventTypes_IdElement ON EventTypes(InstanceId, element);
 
     create index IDX_CMI_Context ON ContextMappingInfo(CONTEXT_ID);    
     create index IDX_CMI_KSession ON ContextMappingInfo(KSESSION_ID);    

diff --git a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/mysqlinnodb/mysql-innodb-jbpm-schema.sql b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/mysqlinnodb/mysql-innodb-jbpm-schema.sql
@@ -768,8 +768,8 @@
     create index IDX_TaskEvent_taskId on TaskEvent (taskId);
     create index IDX_TaskEvent_processInstanceId on TaskEvent (processInstanceId);
 
-    create index IDX_EventTypes_element ON EventTypes(element);
-    create index IDX_EventTypes_compound ON EventTypes(InstanceId, element);
+    create index IDX_EventTypes_Id ON EventTypes(InstanceId);
+    create index IDX_EventTypes_IdElement ON EventTypes(InstanceId, element);
 
     create index IDX_CMI_Context ON ContextMappingInfo(CONTEXT_ID);    
     create index IDX_CMI_KSession ON ContextMappingInfo(KSESSION_ID);    

diff --git a/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/mysql5/jbpm-7.72-to-7.73.sql b/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/mysql5/jbpm-7.72-to-7.73.sql
@@ -0,0 +1,3 @@
+DROP INDEX IDX_EventTypes_element;
+DROP INDEX IDX_EventTypes_compound;
+CREATE INDEX IDX_EventTypes_IdElement ON EventTypes(InstanceId,element);
diff --git a/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/mysql5/rhpam-7.13-to-7.13.1.sql b/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/mysql5/rhpam-7.13-to-7.13.1.sql
@@ -1,2 +1,5 @@
 ALTER TABLE TimerMappingInfo ADD COLUMN processInstanceId bigint;
-ALTER TABLE TimerMappingInfo MODIFY timerId bigint NULL;
+ALTER TABLE TimerMappingInfo MODIFY timerId bigint NULL;
+DROP INDEX IDX_EventTypes_element;
+DROP INDEX IDX_EventTypes_compound;
+CREATE INDEX IDX_EventTypes_IdElement ON EventTypes(InstanceId,element);
diff --git a/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/mysqlinnodb/jbpm-7.72-to-7.73.sql b/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/mysqlinnodb/jbpm-7.72-to-7.73.sql
@@ -0,0 +1,3 @@
+DROP INDEX IDX_EventTypes_element;
+DROP INDEX IDX_EventTypes_compound;
+CREATE INDEX IDX_EventTypes_IdElement ON EventTypes(InstanceId,element);
diff --git a/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/mysqlinnodb/rhpam-7.13-to-7.13.1.sql b/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/mysqlinnodb/rhpam-7.13-to-7.13.1.sql
@@ -1,2 +1,5 @@
 ALTER TABLE TimerMappingInfo ADD COLUMN processInstanceId bigint;
-ALTER TABLE TimerMappingInfo MODIFY timerId bigint NULL;
+ALTER TABLE TimerMappingInfo MODIFY timerId bigint NULL;
+DROP INDEX IDX_EventTypes_element;
+DROP INDEX IDX_EventTypes_compound;
+CREATE INDEX IDX_EventTypes_IdElement ON EventTypes(InstanceId,element);
diff --git a/...rsistence-jpa/src/main/java/org/jbpm/persistence/processinstance/ProcessInstanceInfo.java b/...rsistence-jpa/src/main/java/org/jbpm/persistence/processinstance/ProcessInstanceInfo.java
@@ -85,7 +85,7 @@ public class ProcessInstanceInfo implements PersistentProcessInstance {
     @ElementCollection
     @CollectionTable(name="EventTypes", joinColumns=@JoinColumn(name="InstanceId"),
        indexes = {@Index(name = "IDX_EventTypes_Id",  columnList="InstanceId"),
-                  @Index(name = "IDX_EventTypes_element", columnList="element")})
+                  @Index(name = "IDX_EventTypes_IdElement", columnList="InstanceId, element")})
 
     @Column(name="element")
     private Set<String>                       eventTypes         = new HashSet<String>();