You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by td...@apache.org on 2014/11/11 12:10:47 UTC
spark git commit: [Streaming][Minor]Replace some 'if-else' in Clock
Repository: spark
Updated Branches:
refs/heads/master c8850a3d6 -> 6e03de304
[Streaming][Minor]Replace some 'if-else' in Clock
Replace some 'if-else' statement by math.min and math.max in Clock.scala
Author: huangzhaowei <ca...@gmail.com>
Closes #3088 from SaintBacchus/StreamingClock and squashes the following commits:
7b7f8e7 [huangzhaowei] [Streaming][Minor]Replace some 'if-else' in Clock
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/6e03de30
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/6e03de30
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/6e03de30
Branch: refs/heads/master
Commit: 6e03de304e0294017d832763fd71e642736f8c33
Parents: c8850a3
Author: huangzhaowei <ca...@gmail.com>
Authored: Tue Nov 11 03:02:12 2014 -0800
Committer: Tathagata Das <ta...@gmail.com>
Committed: Tue Nov 11 03:02:12 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/6e03de30/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: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org