Skip to content

[SPARK-21464][SS] Minimize deprecation warnings caused by ProcessingTime class #18678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tdas wants to merge 1 commit into from
Closed

[SPARK-21464][SS] Minimize deprecation warnings caused by ProcessingTime class #18678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions sql/core/src/test/scala/org/apache/spark/sql/ProcessingTimeSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,22 @@ import java.util.concurrent.TimeUnit
import scala.concurrent.duration._

import org.apache.spark.SparkFunSuite
import org.apache.spark.sql.streaming.ProcessingTime
import org.apache.spark.sql.streaming.{ProcessingTime, Trigger}

class ProcessingTimeSuite extends SparkFunSuite {

test("create") {
assert(ProcessingTime(10.seconds).intervalMs === 10 * 1000)
assert(ProcessingTime.create(10, TimeUnit.SECONDS).intervalMs === 10 * 1000)
assert(ProcessingTime("1 minute").intervalMs === 60 * 1000)
assert(ProcessingTime("interval 1 minute").intervalMs === 60 * 1000)

intercept[IllegalArgumentException] { ProcessingTime(null: String) }
intercept[IllegalArgumentException] { ProcessingTime("") }
intercept[IllegalArgumentException] { ProcessingTime("invalid") }
intercept[IllegalArgumentException] { ProcessingTime("1 month") }
intercept[IllegalArgumentException] { ProcessingTime("1 year") }
def getIntervalMs(trigger: Trigger): Long = trigger.asInstanceOf[ProcessingTime].intervalMs
Copy link
Contributor Author

@tdas tdas Jul 19, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reduced 10 lines of deprecation warning to 1 line.


assert(getIntervalMs(Trigger.ProcessingTime(10.seconds)) === 10 * 1000)
assert(getIntervalMs(Trigger.ProcessingTime(10, TimeUnit.SECONDS)) === 10 * 1000)
assert(getIntervalMs(Trigger.ProcessingTime("1 minute")) === 60 * 1000)
assert(getIntervalMs(Trigger.ProcessingTime("interval 1 minute")) === 60 * 1000)

intercept[IllegalArgumentException] { Trigger.ProcessingTime(null: String) }
intercept[IllegalArgumentException] { Trigger.ProcessingTime("") }
intercept[IllegalArgumentException] { Trigger.ProcessingTime("invalid") }
intercept[IllegalArgumentException] { Trigger.ProcessingTime("1 month") }
intercept[IllegalArgumentException] { Trigger.ProcessingTime("1 year") }
}
}
6 changes: 3 additions & 3 deletions sql/core/src/test/scala/org/apache/spark/sql/streaming/FlatMapGroupsWithStateSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ class FlatMapGroupsWithStateSuite extends StateStoreMetricsTest with BeforeAndAf
.flatMapGroupsWithState(Update, ProcessingTimeTimeout)(stateFunc)

testStream(result, Update)(
StartStream(ProcessingTime("1 second"), triggerClock = clock),
StartStream(Trigger.ProcessingTime("1 second"), triggerClock = clock),
AddData(inputData, "a"),
AdvanceManualClock(1 * 1000),
CheckLastBatch(("a", "1")),
Expand Down Expand Up @@ -729,7 +729,7 @@ class FlatMapGroupsWithStateSuite extends StateStoreMetricsTest with BeforeAndAf
.flatMapGroupsWithState(Update, EventTimeTimeout)(stateFunc)

testStream(result, Update)(
StartStream(ProcessingTime("1 second")),
StartStream(Trigger.ProcessingTime("1 second")),
AddData(inputData, ("a", 11), ("a", 13), ("a", 15)), // Set timeout timestamp of ...
CheckLastBatch(("a", 15)), // "a" to 15 + 5 = 20s, watermark to 5s
AddData(inputData, ("a", 4)), // Add data older than watermark for "a"
Expand Down Expand Up @@ -901,7 +901,7 @@ class FlatMapGroupsWithStateSuite extends StateStoreMetricsTest with BeforeAndAf
.flatMapGroupsWithState(Update, ProcessingTimeTimeout)(stateFunc)

testStream(result, Update)(
StartStream(ProcessingTime("1 second"), triggerClock = clock),
StartStream(Trigger.ProcessingTime("1 second"), triggerClock = clock),
AddData(inputData, ("a", 1L)),
AdvanceManualClock(1 * 1000),
CheckLastBatch(("a", "1"))
Expand Down
8 changes: 4 additions & 4 deletions sql/core/src/test/scala/org/apache/spark/sql/streaming/StreamingAggregationSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ class StreamingAggregationSuite extends StateStoreMetricsTest with BeforeAndAfte
.where('value >= current_timestamp().cast("long") - 10L)

testStream(aggregated, Complete)(
StartStream(ProcessingTime("10 seconds"), triggerClock = clock),
StartStream(Trigger.ProcessingTime("10 seconds"), triggerClock = clock),

// advance clock to 10 seconds, all keys retained
AddData(inputData, 0L, 5L, 5L, 10L),
Expand All @@ -294,7 +294,7 @@ class StreamingAggregationSuite extends StateStoreMetricsTest with BeforeAndAfte
clock.advance(60 * 1000L)
true
},
StartStream(ProcessingTime("10 seconds"), triggerClock = clock),
StartStream(Trigger.ProcessingTime("10 seconds"), triggerClock = clock),
// The commit log blown, causing the last batch to re-run
CheckLastBatch((20L, 1), (85L, 1)),
AssertOnQuery { q =>
Expand Down Expand Up @@ -322,7 +322,7 @@ class StreamingAggregationSuite extends StateStoreMetricsTest with BeforeAndAfte
.where($"value".cast("date") >= date_sub(current_date(), 10))
.select(($"value".cast("long") / DateTimeUtils.SECONDS_PER_DAY).cast("long"), $"count(1)")
testStream(aggregated, Complete)(
StartStream(ProcessingTime("10 day"), triggerClock = clock),
StartStream(Trigger.ProcessingTime("10 day"), triggerClock = clock),
// advance clock to 10 days, should retain all keys
AddData(inputData, 0L, 5L, 5L, 10L),
AdvanceManualClock(DateTimeUtils.MILLIS_PER_DAY * 10),
Expand All @@ -346,7 +346,7 @@ class StreamingAggregationSuite extends StateStoreMetricsTest with BeforeAndAfte
clock.advance(DateTimeUtils.MILLIS_PER_DAY * 60)
true
},
StartStream(ProcessingTime("10 day"), triggerClock = clock),
StartStream(Trigger.ProcessingTime("10 day"), triggerClock = clock),
// Commit log blown, causing a re-run of the last batch
CheckLastBatch((20L, 1), (85L, 1)),

Expand Down