#534 added special handling for ML9.0-1.1

Author: dmcassel

marklogic-data-hub/src/main/resources/ml-modules/root/com.marklogic.hub/lib/job-lib.xqy

@@ -12,20 +12,30 @@ declare variable $FAILED-KEY  := "failed";
 
 (:
  : Given a list of job-ids, delete those jobs and any traces associated with them.
+ :
+ : ML 9.0-1.1 is the only DHF-supported version that does not support the <update> option
+ : for xdmp:invoke-function. (<transaction-mode> has been deprecated.)
  :)
 declare function job:delete-jobs-and-traces($job-ids as xs:string*)
 {
   let $job-results := job:delete-jobs($job-ids)
+  let $options :=
+    <options xmlns="xdmp:eval">
+      {
+        if (xdmp:version() = "9.0-1.1") then
+          <transaction-mode>update-auto-commit</transaction-mode>
+        else
+          <update>true</update>
+      }
+      <isolation>different-transaction</isolation>
+      <database>{xdmp:database($config:TRACE-DATABASE)}</database>
+    </options>
   let $deleted-traces :=
     xdmp:invoke-function(
       function() {
         job:delete-traces($job-ids)
       },
-      <options xmlns="xdmp:eval">
-        <update>true</update>
-        <isolation>different-transaction</isolation>
-        <database>{xdmp:database($config:TRACE-DATABASE)}</database>
-      </options>
+      $options
     )
   return
     document {

marklogic-data-hub/src/main/resources/ml-modules/services/delete-jobs.xqy

@@ -31,24 +31,35 @@ declare option xdmp:mapping "false";
  : REST API extension to delete jobs and associated traces.
  : Note: it shouldn't be necessary to use xdmp:invoke-function below, but a bug
  : in ML 8.0-7 (fixed in 8.0-7.1) messes up the transaction mode.
+ :
+ : Also, ML 9.0-1.1 is the only DHF-supported version that does not support the
+ : <update> option for xdmp:invoke-function. (<transaction-mode> has been deprecated.)
  :)
 declare %rapi:transaction-mode("update") function service:post(
     $context as map:map,
     $params  as map:map,
     $input   as document-node()*
 ) as document-node()?
 {
-  perf:log('/v1/resources/delete-jobs:post', function() {
-    xdmp:invoke-function(
-      function() {
-        let $job-ids := fn:tokenize(map:get($params, "jobIds"), ",")
-        return
-          job:delete-jobs-and-traces($job-ids)
-      },
-      <options xmlns="xdmp:eval">
-        <update>true</update>
-        <isolation>same-statement</isolation>
-      </options>
-    )
-  })
+  let $options :=
+    <options xmlns="xdmp:eval">
+      {
+        if (xdmp:version() = "9.0-1.1") then
+          <transaction-mode>update-auto-commit</transaction-mode>
+        else
+          <update>true</update>
+      }
+      <isolation>same-statement</isolation>
+    </options>
+  return
+    perf:log('/v1/resources/delete-jobs:post', function() {
+      xdmp:invoke-function(
+        function() {
+          let $job-ids := fn:tokenize(map:get($params, "jobIds"), ",")
+          return
+            job:delete-jobs-and-traces($job-ids)
+        },
+        $options
+      )
+    })
 };