fixed #336 - slow performance on windows

Author: paxtonhare

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

@@ -862,7 +862,6 @@ declare function flow:validate-entities()
   let $_ :=
     for $entity in flow:get-entities()/hub:entity
     for $flow in $entity/hub:flows/hub:flow
-    let $_ := xdmp:log(("flow!", $flow))
     let $data-format := $flow/hub:data-format
     (: validate collector :)
     let $_ :=

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

@@ -98,7 +98,11 @@ declare function delete(
   $params  as map:map
   ) as document-node()?
 {
-  let $_ := flow:invalidate-flow-caches()
-  return
-    document { () }
+  debug:dump-env("INVALIDATE FLOW CACHES"),
+
+  perf:log('/v1/resources/flow:delete', function() {
+    let $_ := flow:invalidate-flow-caches()
+    return
+      document { () }
+  })
 };

quick-start/src/main/java/com/marklogic/quickstart/service/FileSystemEventListener.java

@@ -9,5 +9,5 @@
 @Component
 public interface FileSystemEventListener {
 
-    void onWatchEvent(HubConfig hubConfig, Path path);
+    void onWatchEvent(HubConfig hubConfig);
 }

quick-start/src/main/java/com/marklogic/quickstart/service/FileSystemWatcherService.java

@@ -64,12 +64,12 @@ public void removeListener(FileSystemEventListener listener) {
         listeners.remove(listener);
     }
 
-    private void notifyListeners(HubConfig hubConfig, Path path) {
+    private void notifyListeners(HubConfig hubConfig) {
         // notify global listeners
         synchronized (listeners) {
             for (FileSystemEventListener listener : listeners) {
                 try {
-                    listener.onWatchEvent(hubConfig, path);
+                    listener.onWatchEvent(hubConfig);
                 }
                 catch (Exception e) {
                     logger.error("Exception occured on listener", e);
@@ -146,50 +146,28 @@ public synchronized void destroy() throws Exception {
     private class DirectoryWatcherThread extends Thread {
 
         private HubConfig hubConfig;
-        private final int DELAY = 500;
+        private final int DELAY = 1000;
 
-        // Use a SET to prevent duplicates from being added when multiple events on the
-        // same file arrive in quick succession.
-        HashSet<Path> filesToReload = new HashSet<>();
         Timer processDelayTimer = null;
 
         DirectoryWatcherThread(String name, HubConfig hubConfig) {
             super(name);
             this.hubConfig = hubConfig;
         }
 
-        private synchronized void addFileToProcess(Path path) {
-            boolean alreadyAdded = !filesToReload.add(path);
-            logger.info("Queuing file for processing: "
-                + path.toString() + (alreadyAdded?"(already queued)":""));
+        private synchronized void queueReload() {
             if (processDelayTimer != null) {
                 processDelayTimer.cancel();
             }
             processDelayTimer = new Timer();
             processDelayTimer.schedule(new TimerTask() {
                 @Override
                 public void run() {
-                    processFiles();
+                    notifyListeners(hubConfig);
                 }
             }, DELAY);
         }
 
-        private synchronized void processFiles() {
-            // Iterate over the set of file to be processed
-            for (Iterator<Path> it = filesToReload.iterator(); it.hasNext();) {
-                Path path = it.next();
-
-                // Sometimes you just have to do what you have to do...
-                logger.info("Processing file: " + path.toString());
-
-                // notify listeners
-                notifyListeners(hubConfig, path);
-
-                // Remove this file from the set.
-                it.remove();
-            }
-        }
-
         @Override
         public void run() {
             for (;;) {
@@ -220,8 +198,8 @@ public void run() {
                     Path child = dir.resolve(context);
 
                     // print out event
-                    logger.info("Event received: {} for: {}", event.kind().name(), child);
-                    addFileToProcess(child);
+                    logger.debug("Event received: {} for: {}", event.kind().name(), child);
+                    queueReload();
 
                     // if directory is created, then register it and its sub-directories
                     // we are always listening recursively

quick-start/src/main/java/com/marklogic/quickstart/web/ProjectsController.java

@@ -352,8 +352,13 @@ public void onValidate(JsonNode validation) {
         template.convertAndSend("/topic/validate-status", validation);
     }
 
+    /**
+     * Called when the filesystem watcher detects a file change. We then install the user modules
+     * @param hubConfig - must pass the hub config because this runs in a separate thread and doesn't
+     *                  have access to the current spring boot context
+     */
     @Override
-    public void onWatchEvent(HubConfig hubConfig, Path path) {
+    public void onWatchEvent(HubConfig hubConfig) {
         installUserModules(hubConfig, false);
     }