Skip to content

[SPARK-21596] Update StreamExecution.scala #18845

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
ddna1021 wants to merge 3 commits into from
Closed

[SPARK-21596] Update StreamExecution.scala #18845

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
add573d
Update StreamExecution.scala
ddna1021 Aug 4, 2017
9b6fb4f
Merge branch 'master' into master
ddna1021 Aug 4, 2017
25a4140
Update StreamExecution.scala
ddna1021 Aug 4, 2017
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
8 changes: 6 additions & 2 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/StreamExecution.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,9 @@ class StreamExecution(
availableOffsets = nextOffsets.toStreamProgress(sources)
/* Initialize committed offsets to a committed batch, which at this
* is the second latest batch id in the offset log. */
offsetLog.get(latestBatchId - 1).foreach { secondLatestBatchId =>
offsetLog.get(latestBatchId - 1).getOrElse {
throw new IllegalStateException(s"batch $latestBatchId doesn't exist")
}.foreach { secondLatestBatchId =>
committedOffsets = secondLatestBatchId.toStreamProgress(sources)
}

Expand Down Expand Up @@ -565,7 +567,9 @@ class StreamExecution(

// Now that we've updated the scheduler's persistent checkpoint, it is safe for the
// sources to discard data from the previous batch.
val prevBatchOff = offsetLog.get(currentBatchId - 1)
val prevBatchOff = offsetLog.get(currentBatchId - 1).getOrElse {
throw new IllegalStateException(s"batch $currentBatchId doesn't exist")
}
if (prevBatchOff.isDefined) {
prevBatchOff.get.toStreamProgress(sources).foreach {
case (src, off) => src.commit(off)
Expand Down