Updated Java code to add day, minutes, and hours

core/src/main/scala/org/apache/spark/util/Utils.scala

@@ -1022,17 +1022,18 @@ private[spark] object Utils extends Logging {
    * Convert a passed time string (e.g. 50s, 100ms, or 250us) to a microsecond count for
    * internal use. If no suffix is provided a direct conversion is attempted.
    */
-  @throws(classOf[NumberFormatException])
   private def parseTimeString(str: String) : (Option[TimeUnit], Long) = {
     val timeError = "Time must be specified as seconds (s), " +
-        "milliseconds (ms), or microseconds (us) e.g. 50s, 100ms, or 250us."
+        "milliseconds (ms), microseconds (us), minutes (min) hour (h), or day(d). " +
+        "E.g. 50s, 100ms, or 250us."
 
     try {
       val lower = str.toLowerCase.trim()
       var suffix: String = ""
       timeSuffixes.foreach(s => {
-        if(lower.endsWith(s._1))
+        if(lower.endsWith(s._1)) {
           suffix = s._1
+        }
       })
 
       (timeSuffixes.get(suffix), str.substring(0, str.length - suffix.length).toLong)

network/common/src/main/java/org/apache/spark/network/util/JavaUtils.java

@@ -135,12 +135,19 @@ private static long timeStringToUs(String str) throws NumberFormatException {
         return Long.parseLong(lower.substring(0, lower.length() - 2));
       } else if (lower.endsWith("s")) {
         return Long.parseLong(lower.substring(0, lower.length() - 1)) * 1000 * 1000;
-      } else {// Invalid suffix, force correct formatting
+      } else if (lower.endsWith("min")) {
+        return Long.parseLong(lower.substring(0, lower.length() - 1)) * 1000 * 1000 * 60;
+      } else if (lower.endsWith("h")) {
+        return Long.parseLong(lower.substring(0, lower.length() - 1)) * 1000 * 1000 * 60 * 60;
+      } else if (lower.endsWith("d")) {
+        return Long.parseLong(lower.substring(0, lower.length() - 1)) * 1000 * 1000 * 60 * 60 * 24;
+      } else {// No suffix, default selected by calling function
         return Long.parseLong(lower);
       }
     } catch(NumberFormatException e) {
       throw new NumberFormatException("Time must be specified as seconds (s), " +
-              "milliseconds (ms), or microseconds (us) e.g. 50s, 100ms, or 250us.");
+              "milliseconds (ms), microseconds (us), minutes (min) hour (h), or day(d). " +
+              "E.g. 50s, 100ms, or 250us.\n" + e.toString());
     }
 
   }