add elapsed statistics logs to suggester rebuild

Author: Vladimir Kotal

suggester/src/main/java/org/opengrok/suggest/Suggester.java

@@ -31,6 +31,7 @@
 import org.apache.lucene.util.BytesRef;
 import org.opengrok.suggest.query.SuggesterPrefixQuery;
 import org.opengrok.suggest.query.SuggesterQuery;
+import org.opengrok.suggest.util.Statistics;
 
 import java.io.Closeable;
 import java.io.File;
@@ -148,6 +149,7 @@ public void init(final Collection<NamedIndexDir> luceneIndexes) {
         }
 
         synchronized (lock) {
+            Statistics elapsed = new Statistics();
             logger.log(Level.INFO, "Initializing suggester");
 
             ExecutorService executor = Executors.newWorkStealingPool(rebuildParallelismLevel);
@@ -156,7 +158,7 @@ public void init(final Collection<NamedIndexDir> luceneIndexes) {
                 submitInitIfIndexExists(executor, indexDir);
             }
 
-            shutdownAndAwaitTermination(executor, "Suggester successfully initialized");
+            shutdownAndAwaitTermination(executor, elapsed, "Suggester successfully initialized");
         }
     }
 
@@ -209,11 +211,11 @@ private boolean indexExists(final Path indexDir) throws IOException {
         }
     }
 
-    private void shutdownAndAwaitTermination(final ExecutorService executorService, final String logMessageOnSuccess) {
+    private void shutdownAndAwaitTermination(final ExecutorService executorService, Statistics elapsed, final String logMessageOnSuccess) {
         executorService.shutdown();
         try {
             executorService.awaitTermination(awaitTerminationTime.toMillis(), TimeUnit.MILLISECONDS);
-            logger.log(Level.INFO, logMessageOnSuccess);
+            elapsed.report(logger, logMessageOnSuccess);
         } catch (InterruptedException e) {
             logger.log(Level.SEVERE, "Interrupted while building suggesters", e);
             Thread.currentThread().interrupt();
@@ -231,6 +233,7 @@ public void rebuild(final Collection<NamedIndexDir> indexDirs) {
         }
 
         synchronized (lock) {
+            Statistics elapsed = new Statistics();
             logger.log(Level.INFO, "Rebuilding the following suggesters: {0}", indexDirs);
 
             ExecutorService executor = Executors.newWorkStealingPool(rebuildParallelismLevel);
@@ -244,7 +247,7 @@ public void rebuild(final Collection<NamedIndexDir> indexDirs) {
                 }
             }
 
-            shutdownAndAwaitTermination(executor, "Suggesters for " + indexDirs + " were successfully rebuilt");
+            shutdownAndAwaitTermination(executor, elapsed, "Suggesters for " + indexDirs + " were successfully rebuilt");
         }
     }
 

suggester/src/main/java/org/opengrok/suggest/util/Statistics.java

@@ -0,0 +1,42 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * See LICENSE.txt included in this distribution for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at LICENSE.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ */
+
+package org.opengrok.suggest.util;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class Statistics {
+
+  private final long startTime;
+
+  public Statistics() {
+      startTime = System.currentTimeMillis();
+  }
+
+  public void report(Logger log, String msg) {
+      long stopTime = System.currentTimeMillis();
+      String time_str = StringUtils.getReadableTime(stopTime - startTime);
+      log.log(Level.INFO, msg + " (took {0})", time_str);
+  }
+}

suggester/src/main/java/org/opengrok/suggest/util/StringUtils.java

@@ -0,0 +1,74 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * See LICENSE.txt included in this distribution for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at LICENSE.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
+ */
+
+package org.opengrok.suggest.util;
+
+/**
+ * Various String utility methods taken from
+ * org.opensolaris.opengrok.util.StringUtils
+ *
+ * @author austvik
+ */
+public final class StringUtils {
+
+  /**
+   * Convert value in milliseconds to readable time.
+   * @param time_ms delta in milliseconds
+   * @return human readable string
+   */
+  public static String getReadableTime(long time_ms) {
+      String output = "";
+      long time_delta = time_ms;
+
+      int milliseconds = (int) (time_delta % 1000);
+      time_delta /= 1000;
+      int seconds = (int) (time_delta % 60);
+      time_delta /= 60;
+      int minutes = (int) (time_delta % 60);
+      time_delta /= 60;
+      int hours = (int) (time_delta % 24);
+      int days = (int) (time_delta / 24);
+
+      if (days != 0) {
+          output += String.format("%d day", days);
+          if (days > 1) {
+              output += "s";
+          }
+          if ((hours != 0) || (minutes != 0) || (seconds != 0)) {
+              output += " ";
+          }
+      }
+      if ((hours != 0) || (minutes != 0)) {
+          return output + String.format("%d:%02d:%02d", hours, minutes, seconds);
+      }
+      if (seconds != 0) {
+          return output + String.format("%d.%d seconds", seconds, milliseconds);
+      }
+      if (milliseconds != 0) {
+          return output + String.format("%d ms", milliseconds);
+      }
+
+      return (output.length() == 0 ? "0" : output);
+  }
+}