diff options
author | Sean Owen <sowen@cloudera.com> | 2015-02-19 15:35:23 -0800 |
---|---|---|
committer | Andrew Or <andrew@databricks.com> | 2015-02-19 15:35:23 -0800 |
commit | 34b7c35380c88569a1396fb4ed991a0bed4288e7 (patch) | |
tree | deb25f1dd88477aff0dc19904cbdc9aedc0cc7d8 /project | |
parent | ad6b169dee84df175b51933b7a3ad7f0bbc52cf3 (diff) | |
download | spark-34b7c35380c88569a1396fb4ed991a0bed4288e7.tar.gz spark-34b7c35380c88569a1396fb4ed991a0bed4288e7.tar.bz2 spark-34b7c35380c88569a1396fb4ed991a0bed4288e7.zip |
SPARK-4682 [CORE] Consolidate various 'Clock' classes
Another one from JoshRosen 's wish list. The first commit is much smaller and removes 2 of the 4 Clock classes. The second is much larger, necessary for consolidating the streaming one. I put together implementations in the way that seemed simplest. Almost all the change is standardizing class and method names.
Author: Sean Owen <sowen@cloudera.com>
Closes #4514 from srowen/SPARK-4682 and squashes the following commits:
5ed3a03 [Sean Owen] Javadoc Clock classes; make ManualClock private[spark]
169dd13 [Sean Owen] Add support for legacy org.apache.spark.streaming clock class names
277785a [Sean Owen] Reduce the net change in this patch by reversing some unnecessary syntax changes along the way
b5e53df [Sean Owen] FakeClock -> ManualClock; getTime() -> getTimeMillis()
160863a [Sean Owen] Consolidate Streaming Clock class into common util Clock
7c956b2 [Sean Owen] Consolidate Clocks except for Streaming Clock
Diffstat (limited to 'project')
-rw-r--r-- | project/MimaExcludes.scala | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/project/MimaExcludes.scala b/project/MimaExcludes.scala index 4065a562a1..ee6229aa6b 100644 --- a/project/MimaExcludes.scala +++ b/project/MimaExcludes.scala @@ -148,6 +148,11 @@ object MimaExcludes { ProblemFilters.exclude[MissingTypesProblem]("org.apache.spark.mllib.linalg.VectorUDT"), ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.spark.mllib.linalg.VectorUDT.serialize"), ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.spark.mllib.linalg.VectorUDT.sqlType") + ) ++ Seq( + // SPARK-4682 + ProblemFilters.exclude[MissingClassProblem]("org.apache.spark.RealClock"), + ProblemFilters.exclude[MissingClassProblem]("org.apache.spark.Clock"), + ProblemFilters.exclude[MissingClassProblem]("org.apache.spark.TestClock") ) case v if v.startsWith("1.2") => |