[kie-roadmap-52] LogCleanupCommand - keep ExecutionErrorInfo entries …

…for active process instances
kiegroup · Oct 21, 2023 · d3bea61 · d3bea61
1 parent 748834a
commit d3bea61
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/jbpm-audit/src/main/java/org/jbpm/process/audit/query/AbstractAuditDeleteBuilderImpl.java b/jbpm-audit/src/main/java/org/jbpm/process/audit/query/AbstractAuditDeleteBuilderImpl.java
@@ -50,14 +50,20 @@ protected static class Subquery {
         private String queryBase;
         private int queryParamId;
         private QueryWhere where;
+        private String join;
 
         private QueryAndParameterAppender queryAndParameterAppender;
 
         public Subquery(String field, String queryBase, int queryParamId) {
+            this(field, queryBase, queryParamId, "in");
+        }
+
+        public Subquery(String field, String queryBase, int queryParamId, String join) {
             this.field = field;
             this.queryBase = queryBase;
             this.queryParamId = queryParamId;
             this.where = new QueryWhere();
+            this.join = join;
         }
 
         public Subquery parameter(String listId, Object... values) {
@@ -79,7 +85,7 @@ public String build() {
             if (queryAndParameterAppender == null) {
                 queryAndParameterAppender = QueryHelper.createQuery(queryBase, where, new HashMap<>(), queryParamId);
             }
-            return field + " in (" + queryAndParameterAppender.toSQL() + ")";
+            return field + " " + join + " (" + queryAndParameterAppender.toSQL() + ")";
         }
 
     }

diff --git a/...xecutor/src/main/java/org/jbpm/executor/impl/jpa/ExecutionErrorInfoDeleteBuilderImpl.java b/...xecutor/src/main/java/org/jbpm/executor/impl/jpa/ExecutionErrorInfoDeleteBuilderImpl.java
@@ -20,6 +20,7 @@
 import org.jbpm.process.audit.JPAAuditLogService;
 import org.jbpm.process.audit.query.AbstractAuditDeleteBuilderImpl;
 import org.jbpm.runtime.manager.impl.jpa.ExecutionErrorInfo;
+import org.kie.api.runtime.process.ProcessInstance;
 import org.kie.internal.runtime.manager.audit.query.ExecutionErrorInfoDeleteBuilder;
 
 import static org.kie.internal.query.QueryParameterIdentifiers.ERROR_DATE_LIST;
@@ -52,4 +53,24 @@ public ExecutionErrorInfoDeleteBuilder dateRangeEnd(Date rangeEnd) {
         addRangeParameter(ERROR_DATE_LIST, "date range end", rangeEnd, false);
         return this;
     }
+
+    @Override
+    protected boolean isSubquerySupported() {
+        return true;
+    }
+
+    @Override
+    protected Subquery applyParameters(Subquery subquery) {
+        return subquery;
+    }
+
+    @Override
+    protected Subquery getSubQuery() {
+        String queryBaseStr = "SELECT spl.processInstanceId FROM ProcessInstanceLog spl where spl.status in (" +
+            ProcessInstance.STATE_PENDING + "," + // 0
+            ProcessInstance.STATE_ACTIVE + "," + // 1
+            ProcessInstance.STATE_SUSPENDED + // 4
+            ")";
+        return new Subquery("l.processInstanceId", queryBaseStr, 1, "not in");
+    }
 }