Allow human-readable units in config.name.maxage

Rather than requiring the value be expressed in minutes, let the
user specify the units, such as "1 day", and perform the conversion
to seconds in our code.

Signed-off-by: Shawn O. Pearce <sop@google.com>

src/main/java/com/google/gerrit/server/cache/CachePool.java

@@ -14,6 +14,11 @@
 
 package com.google.gerrit.server.cache;
 
+import static java.util.concurrent.TimeUnit.DAYS;
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+import com.google.gerrit.server.config.ConfigUtil;
 import com.google.gerrit.server.config.GerritServerConfig;
 import com.google.gerrit.server.config.SitePath;
 import com.google.inject.Inject;
@@ -33,7 +38,6 @@ import org.spearce.jgit.lib.Config;
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 
 /** Pool of all declared caches created by {@link CacheModule}s. */
 @Singleton
@@ -125,7 +129,7 @@ public class CachePool {
           if (live == NamedCacheBinding.DEFAULT)
             live = c.getTimeToLiveSeconds();
 
-          idle = getLong(name, "maxage", idle / 60) * 60;
+          idle = getSeconds(name, "maxage", idle);
           if (live == NamedCacheBinding.INFINITE) {
             // Keep the alive period infinite, rather than expiring.
           } else {
@@ -159,8 +163,11 @@ public class CachePool {
       return config.getInt("cache", name, setting, def);
     }
 
-    private long getLong(String name, String setting, long def) {
-      return config.getLong("cache", name, setting, def);
+    private long getSeconds(String n, String setting, long def) {
+      final long d = MINUTES.convert(def, SECONDS);
+      final long m;
+      m = ConfigUtil.getTimeUnit(config, "cache", n, setting, d, MINUTES);
+      return SECONDS.convert(m, MINUTES);
     }
 
     private void configureDiskStore() {
@@ -204,8 +211,8 @@ public class CachePool {
       c.setMaxElementsInMemory(getInt(null, "memorylimit", 1024));
       c.setMemoryStoreEvictionPolicyFromObject(MemoryStoreEvictionPolicy.LFU);
 
-      final long defaultAge = TimeUnit.MINUTES.convert(90, TimeUnit.DAYS);
-      c.setTimeToIdleSeconds(getLong(null, "maxage", defaultAge) * 60);
+      final long defaultAge = SECONDS.convert(90, DAYS);
+      c.setTimeToIdleSeconds(getSeconds(null, "maxage", defaultAge));
       c.setTimeToLiveSeconds(c.getTimeToIdleSeconds());
       c.setEternal(c.getTimeToIdleSeconds() == 0);
 

src/main/java/com/google/gerrit/server/config/ConfigUtil.java

@@ -0,0 +1,134 @@
+// Copyright (C) 2009 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.gerrit.server.config;
+
+import static org.spearce.jgit.util.StringUtils.equalsIgnoreCase;
+
+import org.spearce.jgit.lib.Config;
+
+import java.util.concurrent.TimeUnit;
+
+public class ConfigUtil {
+  /**
+   * Parse a numerical time unit, such as "1 minute", from the configuration.
+   *
+   * @param config the configuration file to read.
+   * @param section section the key is in.
+   * @param subsection subsection the key is in, or null if not in a subsection.
+   * @param setting name of the setting to read.
+   * @param defaultValue default value to return if no value was set in the
+   *        configuration file.
+   * @param wantUnit the units of {@code defaultValue} and the return value, as
+   *        well as the units to assume if the value does not contain an
+   *        indication of the units.
+   * @return the setting, or {@code defaultValue} if not set, expressed in
+   *         {@code units}.
+   */
+  public static long getTimeUnit(final Config config, final String section,
+      final String subsection, final String setting, final long defaultValue,
+      final TimeUnit wantUnit) {
+    final String valueString = config.getString(section, subsection, setting);
+    if (valueString == null) {
+      return defaultValue;
+    }
+
+    String s = valueString.trim();
+    if (s.length() == 0) {
+      return defaultValue;
+    }
+
+    final String unitName;
+    final int sp = s.indexOf(' ');
+    if (sp > 0) {
+      unitName = s.substring(sp + 1).trim();
+      s = s.substring(0, sp);
+    } else {
+      final char last = s.charAt(s.length() - 1);
+      if ('0' <= last && last <= '9') {
+        unitName = "";
+      } else {
+        unitName = String.valueOf(last);
+        s = s.substring(0, s.length() - 1).trim();
+      }
+    }
+    if (s.length() == 0) {
+      return defaultValue;
+    }
+
+    TimeUnit inputUnit;
+    int inputMul;
+
+    if ("".equals(unitName)) {
+      inputUnit = wantUnit;
+      inputMul = 1;
+
+    } else if (match(unitName, "s", "sec", "second", "seconds")) {
+      inputUnit = TimeUnit.SECONDS;
+      inputMul = 1;
+
+    } else if (match(unitName, "m", "min", "minute", "minutes")) {
+      inputUnit = TimeUnit.MINUTES;
+      inputMul = 1;
+
+    } else if (match(unitName, "h", "hr", "hour", "hours")) {
+      inputUnit = TimeUnit.HOURS;
+      inputMul = 1;
+
+    } else if (match(unitName, "d", "day", "days")) {
+      inputUnit = TimeUnit.DAYS;
+      inputMul = 1;
+
+    } else if (match(unitName, "w", "week", "weeks")) {
+      inputUnit = TimeUnit.DAYS;
+      inputMul = 7;
+
+    } else if (match(unitName, "mon", "month", "months")) {
+      inputUnit = TimeUnit.DAYS;
+      inputMul = 30;
+
+    } else if (match(unitName, "y", "year", "years")) {
+      inputUnit = TimeUnit.DAYS;
+      inputMul = 365;
+
+    } else {
+      throw notTimeUnit(section, subsection, setting, valueString);
+    }
+
+    try {
+      return wantUnit.convert(Long.parseLong(s) * inputMul, inputUnit);
+    } catch (NumberFormatException nfe) {
+      throw notTimeUnit(section, subsection, setting, valueString);
+    }
+  }
+
+  private static boolean match(final String a, final String... cases) {
+    for (final String b : cases) {
+      if (equalsIgnoreCase(a, b)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  private static IllegalArgumentException notTimeUnit(final String section,
+      final String subsection, final String setting, final String valueString) {
+    return new IllegalArgumentException("Invalid time unit value: " + section
+        + (subsection != null ? "." + subsection : "") + "." + setting + " = "
+        + valueString);
+  }
+
+  private ConfigUtil() {
+  }
+}