You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by br...@apache.org on 2017/03/24 00:57:35 UTC
spark git commit: Fix compilation of the Scala 2.10 master branch
Repository: spark
Updated Branches:
refs/heads/master c79118070 -> 93581fbc1
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 <br...@gmail.com>
Closes #17403 from brkyvz/onceTrigger2.10.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/93581fbc
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/93581fbc
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/93581fbc
Branch: refs/heads/master
Commit: 93581fbc18c01595918c565f6737aaa666116114
Parents: c791180
Author: Burak Yavuz <br...@gmail.com>
Authored: Thu Mar 23 17:57:31 2017 -0700
Committer: Burak Yavuz <br...@gmail.com>
Committed: Thu Mar 23 17:57:31 2017 -0700
----------------------------------------------------------------------
.../spark/sql/streaming/ProcessingTime.scala | 20 ++++++++++----------
.../org/apache/spark/sql/streaming/Trigger.java | 2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/93581fbc/sql/core/src/main/scala/org/apache/spark/sql/streaming/ProcessingTime.scala
----------------------------------------------------------------------
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 bdad8e4..9ba1fc0 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))
}
http://git-wip-us.apache.org/repos/asf/spark/blob/93581fbc/sql/core/src/main/scala/org/apache/spark/sql/streaming/Trigger.java
----------------------------------------------------------------------
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 a03a851..3e3997f 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);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org