You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by zs...@apache.org on 2017/01/01 21:25:48 UTC
spark git commit: [SPARK-19050][SS][TESTS] Fix
EventTimeWatermarkSuite 'delay in months and years handled correctly'
Repository: spark
Updated Branches:
refs/heads/master 35e974076 -> 239404737
[SPARK-19050][SS][TESTS] Fix EventTimeWatermarkSuite 'delay in months and years handled correctly'
## What changes were proposed in this pull request?
`monthsSinceEpoch` in this test is like `math.floor(num)`, so `monthDiff` has two possible values.
## How was this patch tested?
Jenkins.
Author: Shixiong Zhu <sh...@databricks.com>
Closes #16449 from zsxwing/watermark-test-hotfix.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/23940473
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/23940473
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/23940473
Branch: refs/heads/master
Commit: 2394047370d2d93bd8bc57b996fee47465c470af
Parents: 35e9740
Author: Shixiong Zhu <sh...@databricks.com>
Authored: Sun Jan 1 13:25:44 2017 -0800
Committer: Shixiong Zhu <sh...@databricks.com>
Committed: Sun Jan 1 13:25:44 2017 -0800
----------------------------------------------------------------------
.../apache/spark/sql/streaming/EventTimeWatermarkSuite.scala | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/23940473/sql/core/src/test/scala/org/apache/spark/sql/streaming/EventTimeWatermarkSuite.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/streaming/EventTimeWatermarkSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/streaming/EventTimeWatermarkSuite.scala
index 23f51ff..c34d119 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/streaming/EventTimeWatermarkSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/streaming/EventTimeWatermarkSuite.scala
@@ -190,7 +190,10 @@ class EventTimeWatermarkSuite extends StreamTest with BeforeAndAfter with Loggin
assertEventStats { e =>
assert(timestampFormat.parse(e.get("max")).getTime === (currentTimeMs / 1000) * 1000)
val watermarkTime = timestampFormat.parse(e.get("watermark"))
- assert(monthsSinceEpoch(currentTime) - monthsSinceEpoch(watermarkTime) === 29)
+ val monthDiff = monthsSinceEpoch(currentTime) - monthsSinceEpoch(watermarkTime)
+ // monthsSinceEpoch is like `math.floor(num)`, so monthDiff has two possible values.
+ assert(monthDiff === 29 || monthDiff === 30,
+ s"currentTime: $currentTime, watermarkTime: $watermarkTime")
}
)
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org