fixed #235 - exception when writer has error

Author: paxtonhare

.gitignore

@@ -2,6 +2,7 @@
 .gradle/
 .settings/
 .metadata/
+.idea/
 marklogic-data-hub/bin/
 quick-start/bin/
 build/

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

@@ -517,16 +517,9 @@ declare function flow:run-flow(
 {
   let $envelope := flow:run-plugins($flow, $identifier, $content, $options)
   let $_ :=
-    xdmp:invoke-function(function() {
-      for $writer in $flow/hub:writer
-      return
-        flow:run-writer($writer, $identifier, $envelope, $flow/hub:type, $options)
-    },
-    map:new((
-      map:entry("isolation", "different-transaction"),
-      map:entry("database", xdmp:database($config:FINAL-DATABASE)),
-      map:entry("transactionMode", "update-auto-commit")
-    )))
+    for $writer in $flow/hub:writer
+    return
+      flow:run-writer($writer, $identifier, $envelope, $flow/hub:type, $options)
   let $_ := trace:write-trace()
   return
     ()
@@ -739,7 +732,14 @@ declare function flow:run-writer(
   let $before := xdmp:elapsed-time()
   let $resp :=
     try {
-      $func($identifier, $envelope, $options)
+      xdmp:invoke-function(function() {
+        $func($identifier, $envelope, $options)
+      },
+      map:new((
+        map:entry("isolation", "different-transaction"),
+        map:entry("database", xdmp:database($config:FINAL-DATABASE)),
+        map:entry("transactionMode", "update-auto-commit")
+      )))
     }
     catch($ex) {
       xdmp:log(xdmp:describe($ex, (), ())),

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

@@ -47,7 +47,7 @@ declare function trace:enable-tracing($enabled as xs:boolean)
 
 declare function trace:enabled() as xs:boolean
 {
-  let $value := cts:element-values(xs:QName("trace:is-tracing-enabled"), (), "limit=1")
+  let $value := cts:element-values(xs:QName("trace:is-tracing-enabled"), (), ("type=unsignedInt","limit=1"))
   return
     if ($value) then
       $value eq 1

marklogic-data-hub/src/test/java/com/marklogic/hub/TracingTest.java

@@ -159,6 +159,25 @@ public void runXMLErrorFlowWithoutTracing() {
         assertEquals(1, getTracingDocCount());
     }
 
+    @Test
+    public void runXMLWriterErrorFlowWithoutTracing() {
+        assertEquals(0, getFinalDocCount());
+        assertEquals(0, getTracingDocCount());
+
+        Tracing t = new Tracing(stagingClient);
+        assertFalse(t.isEnabled());
+
+        FlowManager fm = new FlowManager(stagingClient);
+        Flow flow = fm.getFlow("trace-entity", "tracemeXMLWriterError");
+
+        JobFinishedListener listener = new JobFinishedListener();
+        fm.runFlow(flow, 10, listener);
+        listener.waitForFinish();
+
+        assertEquals(0, getFinalDocCount());
+        assertEquals(1, getTracingDocCount());
+    }
+
     @Test
     public void runJSONErrorFlowWithoutTracing() {
         assertEquals(0, getFinalDocCount());
@@ -179,4 +198,22 @@ public void runJSONErrorFlowWithoutTracing() {
     }
 
 
+    @Test
+    public void runJSONWriterErrorFlowWithoutTracing() {
+        assertEquals(0, getFinalDocCount());
+        assertEquals(0, getTracingDocCount());
+
+        Tracing t = new Tracing(stagingClient);
+        assertFalse(t.isEnabled());
+
+        FlowManager fm = new FlowManager(stagingClient);
+        Flow flow = fm.getFlow("trace-entity", "tracemeJSONWriterError");
+
+        JobFinishedListener listener = new JobFinishedListener();
+        fm.runFlow(flow, 10, listener);
+        listener.waitForFinish();
+
+        assertEquals(0, getFinalDocCount());
+        assertEquals(1, getTracingDocCount());
+    }
 }

marklogic-data-hub/src/test/resources/flow-manager-test/my-test-flow-with-all/writer/writer-with-error.xqy

@@ -0,0 +1,14 @@
+/*
+ * Collect IDs plugin
+ *
+ * @param options - a map containing options. Options are sent from Java
+ *
+ * @return - an array of ids or uris
+ */
+function collect(options) {
+  return ['1', '2', '3', '4', '5'];
+}
+
+module.exports = {
+  collect: collect
+};

marklogic-data-hub/src/test/resources/tracing-test/plugins/entities/trace-entity/harmonize/tracemeJSONWriterError/collector/collector.sjs

@@ -0,0 +1,17 @@
+/*
+ * Create Content Plugin
+ *
+ * @param id         - the identifier returned by the collector
+ * @param options    - an object containing options. Options are sent from Java
+ *
+ * @return - your content
+ */
+function createContent(id, options) {
+  return {
+    id: id
+  };
+}
+
+module.exports = {
+  createContent: createContent
+};

marklogic-data-hub/src/test/resources/tracing-test/plugins/entities/trace-entity/harmonize/tracemeJSONWriterError/content/content.sjs

@@ -0,0 +1,16 @@
+/*
+ * Create Headers Plugin
+ *
+ * @param id       - the identifier returned by the collector
+ * @param content  - the output of your content plugin
+ * @param options  - an object containing options. Options are sent from Java
+ *
+ * @return - an object of headers
+ */
+function createHeaders(id, content, options) {
+  return { id: id };
+}
+
+module.exports = {
+  createHeaders: createHeaders
+};

marklogic-data-hub/src/test/resources/tracing-test/plugins/entities/trace-entity/harmonize/tracemeJSONWriterError/headers/headers.sjs

@@ -0,0 +1,6 @@
+<?xml version="1.0" ?>
+<flow xmlns="http://marklogic.com/data-hub">
+  <complexity>simple</complexity>
+  <data-format>application/json</data-format>
+  <plugins></plugins>
+</flow>

marklogic-data-hub/src/test/resources/tracing-test/plugins/entities/trace-entity/harmonize/tracemeJSONWriterError/tracemeJSONWriterError.xml

@@ -0,0 +1,18 @@
+/*
+ * Create Triples Plugin
+ *
+ * @param id       - the identifier returned by the collector
+ * @param content  - the output of your content plugin
+ * @param headers  - the output of your heaaders plugin
+ * @param options  - an object containing options. Options are sent from Java
+ *
+ * @return - an array of triples
+ */
+function createTriples(id, content, headers, options) {
+  return [];
+}
+
+module.exports = {
+  createTriples: createTriples
+};
+