Bulk deleting bytes should only select from attachment, historic deta…

…il and historic variables that do have a byte array reference
filiphr · Apr 2, 2024 · 643a121 · 643a121
1 parent 3f2ef75
commit 643a121
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Attachment.xml b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Attachment.xml
@@ -139,6 +139,7 @@
         select ATTACHMENT_.CONTENT_ID_
         from ${prefix}ACT_HI_ATTACHMENT ATTACHMENT_
         where 
+        ATTACHMENT_.CONTENT_ID_ is not null and (
         <foreach item="listItem" index="listIndex" collection="collection">
             <if test="listIndex &gt; 0">
             or
@@ -148,6 +149,7 @@
               #{item}
             </foreach>
         </foreach>
+        )
     )
   </delete>
 

diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/HistoricDetail.xml b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/HistoricDetail.xml
@@ -159,6 +159,7 @@
           select HIDETAIL.BYTEARRAY_ID_
           from ${prefix}ACT_HI_DETAIL HIDETAIL
           where 
+          HIDETAIL.BYTEARRAY_ID_ is not null and (
           <foreach item="listItem" index="listIndex" collection="collection">
             <if test="listIndex &gt; 0">
             or
@@ -168,6 +169,7 @@
               #{item}
             </foreach>
           </foreach>
+        )
       )
   </delete>
 
@@ -190,6 +192,7 @@
           select HIDETAIL.BYTEARRAY_ID_
           from ${prefix}ACT_HI_DETAIL HIDETAIL
           where 
+          HIDETAIL.BYTEARRAY_ID_ is not null and (
           <foreach item="listItem" index="listIndex" collection="collection">
             <if test="listIndex &gt; 0">
             or
@@ -199,6 +202,7 @@
               #{item}
             </foreach>
           </foreach>
+          )
       )
   </delete>
 

diff --git a/...in/resources/org/flowable/variable/service/db/mapping/entity/HistoricVariableInstance.xml b/...in/resources/org/flowable/variable/service/db/mapping/entity/HistoricVariableInstance.xml
@@ -159,6 +159,7 @@
             select VARINST.BYTEARRAY_ID_
             from ${prefix}ACT_HI_VARINST VARINST
             where 
+            VARINST.BYTEARRAY_ID_ is not null and (
             <foreach item="listItem" index="listIndex" collection="collection">
                 <if test="listIndex &gt; 0">
                 or
@@ -168,6 +169,7 @@
                   #{item}
                 </foreach>
             </foreach>
+            )
         )
     </delete>
 
@@ -190,6 +192,7 @@
             select VARINST.BYTEARRAY_ID_
             from ${prefix}ACT_HI_VARINST VARINST
             where 
+            VARINST.BYTEARRAY_ID_ is not null and (
             <foreach item="listItem" index="listIndex" collection="collection">
                 <if test="listIndex &gt; 0">
                 or
@@ -199,6 +202,7 @@
                   #{item}
                 </foreach>
             </foreach>
+            )
         )
     </delete>
 
@@ -231,6 +235,7 @@
                 </foreach>
             </foreach>)
             and VARINST.SCOPE_TYPE_ = #{scopeType}
+            and VARINST.BYTEARRAY_ID_ is not null
         )
     </delete>