Merge pull request #270 from marklogic/feature/progress-fix

Fixing log message for writing items

Author: rjrudin

src/main/java/com/marklogic/spark/DefaultSource.java

@@ -107,7 +107,7 @@ public Table getTable(StructType schema, Transform[] partitioning, Map<String, S
         }
 
         final long writeProgressInterval = tempContext.getNumericOption(Options.WRITE_LOG_PROGRESS, 0, 0);
-        String message = Util.isReadWithCustomCodeOperation(properties) ? "Items processed: {}" : "Documents written: {}";
+        String message = Util.isWriteWithCustomCodeOperation(properties) ? "Items processed: {}" : "Documents written: {}";
         WriteProgressLogger.initialize(writeProgressInterval, message);
         return new MarkLogicTable(new WriteContext(schema, properties));
     }

src/main/java/com/marklogic/spark/Util.java

@@ -64,6 +64,13 @@ static boolean isReadWithCustomCodeOperation(Map<String, String> properties) {
         );
     }
 
+    static boolean isWriteWithCustomCodeOperation(Map<String, String> properties) {
+        return Util.hasOption(properties,
+            Options.WRITE_INVOKE, Options.WRITE_JAVASCRIPT, Options.WRITE_XQUERY,
+            Options.WRITE_JAVASCRIPT_FILE, Options.WRITE_XQUERY_FILE
+        );
+    }
+
     /**
      * Allows Flux to override what's shown in a validation error. The connector is fine showing option names
      * such as "spark.marklogic.read.opticQuery", but that is meaningless to a Flux user. This can also be used to

src/main/java/com/marklogic/spark/writer/MarkLogicWrite.java

@@ -112,8 +112,7 @@ public void abort(long epochId, WriterCommitMessage[] messages) {
     }
 
     private DataWriterFactory determineWriterFactory() {
-        if (writeContext.hasOption(Options.WRITE_INVOKE, Options.WRITE_JAVASCRIPT, Options.WRITE_XQUERY,
-            Options.WRITE_JAVASCRIPT_FILE, Options.WRITE_XQUERY_FILE)) {
+        if (Util.isWriteWithCustomCodeOperation(writeContext.getProperties())) {
             CustomCodeContext context = new CustomCodeContext(
                 writeContext.getProperties(), writeContext.getSchema(), Options.WRITE_VARS_PREFIX
             );