Repository: spark Updated Branches: refs/heads/branch-1.2 7710b7156 -> cc1f3a0d6
[Streaming][Minor]Replace some 'if-else' in Clock Replace some 'if-else' statement by math.min and math.max in Clock.scala Author: huangzhaowei <[email protected]> Closes #3088 from SaintBacchus/StreamingClock and squashes the following commits: 7b7f8e7 [huangzhaowei] [Streaming][Minor]Replace some 'if-else' in Clock (cherry picked from commit 6e03de304e0294017d832763fd71e642736f8c33) Signed-off-by: Tathagata Das <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/cc1f3a0d Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/cc1f3a0d Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/cc1f3a0d Branch: refs/heads/branch-1.2 Commit: cc1f3a0d6bfc5299e9db1d8ca50e33d2411d7cd9 Parents: 7710b71 Author: huangzhaowei <[email protected]> Authored: Tue Nov 11 03:02:12 2014 -0800 Committer: Tathagata Das <[email protected]> Committed: Tue Nov 11 03:19:26 2014 -0800 ---------------------------------------------------------------------- .../org/apache/spark/streaming/util/Clock.scala | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/cc1f3a0d/streaming/src/main/scala/org/apache/spark/streaming/util/Clock.scala ---------------------------------------------------------------------- diff --git a/streaming/src/main/scala/org/apache/spark/streaming/util/Clock.scala b/streaming/src/main/scala/org/apache/spark/streaming/util/Clock.scala index 39145a3..7cd867c 100644 --- a/streaming/src/main/scala/org/apache/spark/streaming/util/Clock.scala +++ b/streaming/src/main/scala/org/apache/spark/streaming/util/Clock.scala @@ -41,13 +41,7 @@ class SystemClock() extends Clock { return currentTime } - val pollTime = { - if (waitTime / 10.0 > minPollTime) { - (waitTime / 10.0).toLong - } else { - minPollTime - } - } + val pollTime = math.max(waitTime / 10.0, minPollTime).toLong while (true) { currentTime = System.currentTimeMillis() @@ -55,12 +49,7 @@ class SystemClock() extends Clock { if (waitTime <= 0) { return currentTime } - val sleepTime = - if (waitTime < pollTime) { - waitTime - } else { - pollTime - } + val sleepTime = math.min(waitTime, pollTime) Thread.sleep(sleepTime) } -1 --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
