diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-07-06 15:51:41 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-07-06 15:51:41 -0700 |
| commit | 1ffadb2d9e87169ccc406cd34dab6bd7beda70f1 (patch) | |
| tree | cb5439f40df3865ec71d285700e377d9d5822c7d /streaming | |
| parent | 94871e4703d8566359a405da58c60f411b14857a (diff) | |
| parent | 37abe84212c6dad6fb87a3b47666d6a3c14c1f66 (diff) | |
| download | spark-1ffadb2d9e87169ccc406cd34dab6bd7beda70f1.tar.gz spark-1ffadb2d9e87169ccc406cd34dab6bd7beda70f1.tar.bz2 spark-1ffadb2d9e87169ccc406cd34dab6bd7beda70f1.zip | |
Merge remote-tracking branch 'pwendell/ui-updates'
Conflicts:
core/src/main/scala/spark/scheduler/DAGScheduler.scala
core/src/main/scala/spark/util/AkkaUtils.scala
pom.xml
Diffstat (limited to 'streaming')
| -rw-r--r-- | streaming/src/main/scala/spark/streaming/Duration.scala | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/streaming/src/main/scala/spark/streaming/Duration.scala b/streaming/src/main/scala/spark/streaming/Duration.scala index ee26206e24..c2135195d8 100644 --- a/streaming/src/main/scala/spark/streaming/Duration.scala +++ b/streaming/src/main/scala/spark/streaming/Duration.scala @@ -1,5 +1,7 @@ package spark.streaming +import spark.Utils + case class Duration (private val millis: Long) { def < (that: Duration): Boolean = (this.millis < that.millis) @@ -32,8 +34,10 @@ case class Duration (private val millis: Long) { def toFormattedString: String = millis.toString def milliseconds: Long = millis -} + def prettyPrint = Utils.msDurationToString(millis) + +} /** * Helper object that creates instance of [[spark.streaming.Duration]] representing |