aboutsummaryrefslogtreecommitdiff
path: root/sql/core/src/main
diff options
context:
space:
mode:
authorBurak Yavuz <brkyvz@gmail.com>2017-03-23 17:57:31 -0700
committerBurak Yavuz <brkyvz@gmail.com>2017-03-23 17:57:31 -0700
commit93581fbc18c01595918c565f6737aaa666116114 (patch)
treebc17202d25d827074b24faf9f616949124b69d9e /sql/core/src/main
parentc7911807050227fcd13161ce090330d9d8daa533 (diff)
downloadspark-93581fbc18c01595918c565f6737aaa666116114.tar.gz
spark-93581fbc18c01595918c565f6737aaa666116114.tar.bz2
spark-93581fbc18c01595918c565f6737aaa666116114.zip
Fix compilation of the Scala 2.10 master branch
## What changes were proposed in this pull request? Fixes break caused by: https://github.com/apache/spark/commit/746a558de2136f91f8fe77c6e51256017aa50913 ## How was this patch tested? Compiled with `build/sbt -Dscala2.10 sql/compile` locally Author: Burak Yavuz <brkyvz@gmail.com> Closes #17403 from brkyvz/onceTrigger2.10.
Diffstat (limited to 'sql/core/src/main')
-rw-r--r--sql/core/src/main/scala/org/apache/spark/sql/streaming/ProcessingTime.scala20
-rw-r--r--sql/core/src/main/scala/org/apache/spark/sql/streaming/Trigger.java2
2 files changed, 11 insertions, 11 deletions
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/streaming/ProcessingTime.scala b/sql/core/src/main/scala/org/apache/spark/sql/streaming/ProcessingTime.scala
index bdad8e4717..9ba1fc01cb 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/streaming/ProcessingTime.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/streaming/ProcessingTime.scala
@@ -51,7 +51,7 @@ import org.apache.spark.unsafe.types.CalendarInterval
*/
@Experimental
@InterfaceStability.Evolving
-@deprecated("use Trigger.ProcessingTimeTrigger(intervalMs)", "2.2.0")
+@deprecated("use Trigger.ProcessingTime(intervalMs)", "2.2.0")
case class ProcessingTime(intervalMs: Long) extends Trigger {
require(intervalMs >= 0, "the interval of trigger should not be negative")
}
@@ -64,7 +64,7 @@ case class ProcessingTime(intervalMs: Long) extends Trigger {
*/
@Experimental
@InterfaceStability.Evolving
-@deprecated("use Trigger.ProcessingTimeTrigger(intervalMs)", "2.2.0")
+@deprecated("use Trigger.ProcessingTime(intervalMs)", "2.2.0")
object ProcessingTime {
/**
@@ -76,9 +76,9 @@ object ProcessingTime {
* }}}
*
* @since 2.0.0
- * @deprecated use Trigger.ProcessingTimeTrigger(interval)
+ * @deprecated use Trigger.ProcessingTime(interval)
*/
- @deprecated("use Trigger.ProcessingTimeTrigger(interval)", "2.2.0")
+ @deprecated("use Trigger.ProcessingTime(interval)", "2.2.0")
def apply(interval: String): ProcessingTime = {
if (StringUtils.isBlank(interval)) {
throw new IllegalArgumentException(
@@ -108,9 +108,9 @@ object ProcessingTime {
* }}}
*
* @since 2.0.0
- * @deprecated use Trigger.ProcessingTimeTrigger(interval)
+ * @deprecated use Trigger.ProcessingTime(interval)
*/
- @deprecated("use Trigger.ProcessingTimeTrigger(interval)", "2.2.0")
+ @deprecated("use Trigger.ProcessingTime(interval)", "2.2.0")
def apply(interval: Duration): ProcessingTime = {
new ProcessingTime(interval.toMillis)
}
@@ -124,9 +124,9 @@ object ProcessingTime {
* }}}
*
* @since 2.0.0
- * @deprecated use Trigger.ProcessingTimeTrigger(interval)
+ * @deprecated use Trigger.ProcessingTime(interval)
*/
- @deprecated("use Trigger.ProcessingTimeTrigger(interval)", "2.2.0")
+ @deprecated("use Trigger.ProcessingTime(interval)", "2.2.0")
def create(interval: String): ProcessingTime = {
apply(interval)
}
@@ -141,9 +141,9 @@ object ProcessingTime {
* }}}
*
* @since 2.0.0
- * @deprecated use Trigger.ProcessingTimeTrigger(interval)
+ * @deprecated use Trigger.ProcessingTime(interval, unit)
*/
- @deprecated("use Trigger.ProcessingTimeTrigger(interval, unit)", "2.2.0")
+ @deprecated("use Trigger.ProcessingTime(interval, unit)", "2.2.0")
def create(interval: Long, unit: TimeUnit): ProcessingTime = {
new ProcessingTime(unit.toMillis(interval))
}
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/streaming/Trigger.java b/sql/core/src/main/scala/org/apache/spark/sql/streaming/Trigger.java
index a03a851f24..3e3997fa9b 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/streaming/Trigger.java
+++ b/sql/core/src/main/scala/org/apache/spark/sql/streaming/Trigger.java
@@ -43,7 +43,7 @@ public class Trigger {
* @since 2.2.0
*/
public static Trigger ProcessingTime(long intervalMs) {
- return ProcessingTime.apply(intervalMs);
+ return ProcessingTime.create(intervalMs, TimeUnit.MILLISECONDS);
}
/**