[JBPM-9877] Revert schema changes for DB partition

kiegroup · Sep 3, 2021 · e2b54f7 · e2b54f7
1 parent 36b32c1
commit e2b54f7
Show file tree

Hide file tree

Showing 52 changed files with 104 additions and 558 deletions.
diff --git a/jbpm-audit/src/main/java/org/jbpm/process/audit/ArchiveLoggerProvider.java b/jbpm-audit/src/main/java/org/jbpm/process/audit/ArchiveLoggerProvider.java
@@ -18,8 +18,14 @@
 
 import javax.persistence.EntityManager;
 
+import org.kie.internal.task.api.AuditTask;
+import org.kie.internal.task.api.model.TaskEvent;
+
 public interface ArchiveLoggerProvider {
 
     void archive(EntityManager em, ProcessInstanceLog log);
 
+    void archive(EntityManager em, TaskEvent event);
+
+    void archive(EntityManager em, AuditTask event);
 }
diff --git a/jbpm-audit/src/main/java/org/jbpm/process/audit/DefaultArchiveLoggerProvider.java b/jbpm-audit/src/main/java/org/jbpm/process/audit/DefaultArchiveLoggerProvider.java
diff --git a/jbpm-audit/src/main/java/org/jbpm/process/audit/NodeInstanceLog.java b/jbpm-audit/src/main/java/org/jbpm/process/audit/NodeInstanceLog.java
@@ -74,10 +74,6 @@ public class NodeInstanceLog implements Serializable, AuditEvent, org.kie.api.ru
     @Column(nullable=true)
     private Integer slaCompliance;
 
-    @Temporal(TemporalType.TIMESTAMP)
-    @Column(name = "end_date")
-    private Date end;
-
     public NodeInstanceLog() {
     }
 
@@ -92,14 +88,6 @@ public NodeInstanceLog(int type, long processInstanceId, String processId,
         this.date = new Date();
     }
 
-    public Date getEnd() {
-        return end;
-    }
-
-    public void setEnd(Date end) {
-        this.end = end;
-    }
-
 	public Integer getType() {
 		return type;
 	}

diff --git a/jbpm-audit/src/main/java/org/jbpm/process/audit/VariableInstanceLog.java b/jbpm-audit/src/main/java/org/jbpm/process/audit/VariableInstanceLog.java
@@ -72,10 +72,6 @@ public class VariableInstanceLog implements Serializable, AuditEvent, org.kie.ap
 
     private String externalId;
 
-    @Temporal(TemporalType.TIMESTAMP)
-    @Column(name = "end_date")
-    private Date end;
-
 	// constructors
 
     public VariableInstanceLog() {
@@ -100,14 +96,6 @@ public void setId(long id) {
 		this.id = id;
 	}
 
-    public Date getEnd() {
-        return end;
-    }
-
-    public void setEnd(Date end) {
-        this.end = end;
-    }
-
     public Long getProcessInstanceId() {
         return processInstanceId;
     }

diff --git a/jbpm-audit/src/main/resources/META-INF/services/org.jbpm.process.audit.ArchiveLoggerProvider b/jbpm-audit/src/main/resources/META-INF/services/org.jbpm.process.audit.ArchiveLoggerProvider
diff --git a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/db2/db2-jbpm-schema.sql b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/db2/db2-jbpm-schema.sql
@@ -30,7 +30,6 @@
         taskId bigint,
         workItemId bigint,
         lastModificationDate timestamp,
-        end_date timestamp,
         primary key (id)
     );
 
@@ -45,7 +44,6 @@
         taskId bigint not null,
         taskName varchar(255),
         userId varchar(255),
-        end_date timestamp,
         OPTLOCK integer,
         primary key (pk)
     );
@@ -218,7 +216,6 @@
         workItemId bigint,
         nodeContainerId varchar(255),
         referenceId bigint,
-        end_date timestamp,
         primary key (id)
     );
 
@@ -418,7 +415,6 @@
         workItemId bigint,
         correlationKey varchar(255),
         processType integer,
-        end_date timestamp,
         primary key (id)
     );
 
@@ -444,7 +440,6 @@
         value varchar(255),
         variableId varchar(255),
         variableInstanceId varchar(255),
-        end_date timestamp,
         primary key (id)
     );
 

diff --git a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/derby/derby-jbpm-schema.sql b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/derby/derby-jbpm-schema.sql
@@ -30,7 +30,6 @@
         taskId bigint,
         workItemId bigint,
         lastModificationDate timestamp,
-        end_date timestamp,
         primary key (id)
     );
 
@@ -46,7 +45,6 @@
         taskName varchar(255),
         userId varchar(255),
         OPTLOCK integer,
-        end_date timestamp,
         primary key (pk)
     );
 
@@ -218,7 +216,6 @@
         workItemId bigint,
         nodeContainerId varchar(255),
         referenceId bigint,
-        end_date timestamp,
         primary key (id)
     );
 
@@ -418,7 +415,6 @@
         workItemId bigint,
         correlationKey varchar(255),
         processType integer,
-        end_date timestamp,
         primary key (id)
     );
 
@@ -444,7 +440,6 @@
         value varchar(255),
         variableId varchar(255),
         variableInstanceId varchar(255),
-        end_date timestamp,
         primary key (id)
     );
 

diff --git a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/h2/h2-jbpm-schema.sql b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/h2/h2-jbpm-schema.sql
@@ -30,7 +30,6 @@
         taskId bigint,
         workItemId bigint,
         lastModificationDate timestamp,
-        end_date timestamp,
         primary key (id)
     );
 
@@ -46,7 +45,6 @@
         taskName varchar(255),
         userId varchar(255),
         OPTLOCK integer,
-        end_date timestamp,
         primary key (pk)
     );
 
@@ -218,7 +216,6 @@
         workItemId bigint,
         nodeContainerId varchar(255),
         referenceId bigint,
-        end_date timestamp,
         primary key (id)
     );
 
@@ -418,7 +415,6 @@
         workItemId bigint,
         correlationKey varchar(255),
         processType integer,
-        end_date timestamp,
         primary key (id)
     );
 
@@ -444,7 +440,6 @@
         value varchar(255),
         variableId varchar(255),
         variableInstanceId varchar(255),
-        end_date timestamp,
         primary key (id)
     );
 

diff --git a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/hsqldb/hsqldb-jbpm-schema.sql b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/hsqldb/hsqldb-jbpm-schema.sql
@@ -30,7 +30,6 @@
         taskId bigint,
         workItemId bigint,
         lastModificationDate timestamp,
-        end_date timestamp,
         primary key (id)
     );
 
@@ -46,7 +45,6 @@
         taskName varchar(255),
         userId varchar(255),
         OPTLOCK integer,
-        end_date timestamp,
         primary key (pk)
     );
 
@@ -218,7 +216,6 @@
         workItemId bigint,
         nodeContainerId varchar(255),
         referenceId bigint,
-        end_date timestamp,
         primary key (id)
     );
 
@@ -418,7 +415,6 @@
         workItemId bigint,
         correlationKey varchar(255),
         processType integer,
-        end_date timestamp,
         primary key (id)
     );
 
@@ -444,7 +440,6 @@
         value varchar(255),
         variableId varchar(255),
         variableInstanceId varchar(255),
-        end_date timestamp,
         primary key (id)
     );
 

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
@@ -30,7 +30,6 @@
         taskId bigint,
         workItemId bigint,
         lastModificationDate datetime(6),
-        end_date datetime(6),
         primary key (id)
     );
 
@@ -46,7 +45,6 @@
         taskName varchar(255),
         userId varchar(255),
         OPTLOCK integer,
-        end_date datetime(6),
         primary key (pk)
     );
 
@@ -218,7 +216,6 @@
         workItemId bigint,
         nodeContainerId varchar(255),
         referenceId bigint,
-        end_date datetime(6),
         primary key (id)
     );
 
@@ -418,7 +415,6 @@
         workItemId bigint,
         correlationKey varchar(255),
         processType integer,
-        end_date datetime(6),
         primary key (id)
     );
 
@@ -444,7 +440,6 @@
         value varchar(255),
         variableId varchar(255),
         variableInstanceId varchar(255),
-        end_date datetime(6),
         primary key (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
@@ -30,7 +30,6 @@
         taskId bigint,
         workItemId bigint,
         lastModificationDate datetime(6),
-        end_date datetime(6),
         primary key (id)
     ) ENGINE=InnoDB;
 
@@ -46,7 +45,6 @@
         taskName varchar(255),
         userId varchar(255),
         OPTLOCK integer,
-        end_date datetime(6),
         primary key (pk)
     ) ENGINE=InnoDB;
 
@@ -218,7 +216,6 @@
         workItemId bigint,
         nodeContainerId varchar(255),
         referenceId bigint,
-        end_date datetime(6),
         primary key (id)
     ) ENGINE=InnoDB;
 
@@ -418,7 +415,6 @@
         workItemId bigint,
         correlationKey varchar(255),
         processType integer,
-        end_date datetime(6),
         primary key (id)
     );
 
@@ -444,7 +440,6 @@
         value varchar(255),
         variableId varchar(255),
         variableInstanceId varchar(255),
-        end_date datetime(6),
         primary key (id)
     ) ENGINE=InnoDB;
 

diff --git a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/oracle/oracle-jbpm-schema.sql b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/oracle/oracle-jbpm-schema.sql
@@ -30,7 +30,6 @@
         taskId number(19,0),
         workItemId number(19,0),
         lastModificationDate timestamp,
-        end_date timestamp,
         primary key (id)
     );
 
@@ -46,7 +45,6 @@
         taskName varchar2(255 char),
         userId varchar2(255 char),
         OPTLOCK number(10,0),
-        end_date timestamp,
         primary key (pk)
     );
 
@@ -218,7 +216,6 @@
         workItemId number(19,0),
         nodeContainerId varchar2(255 char),
         referenceId number(19,0),
-        end_date timestamp,
         primary key (id)
     );
 
@@ -418,7 +415,6 @@
         workItemId number(19,0),
         correlationKey varchar(255),
         processType number(1,0),
-        end_date timestamp,
         primary key (id)
     );
 
@@ -444,7 +440,6 @@
         value varchar2(255 char),
         variableId varchar2(255 char),
         variableInstanceId varchar2(255 char),
-        end_date timestamp,
         primary key (id)
     );