Skip to content
Snippets Groups Projects
Commit 93581fbc authored by Burak Yavuz's avatar Burak Yavuz
Browse files

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.
parent c7911807
No related branches found
No related tags found
No related merge requests found
......@@ -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))
}
......
......@@ -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);
}
/**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment