Github user brkyvz commented on a diff in the pull request:
https://github.com/apache/spark/pull/17613#discussion_r111067826
--- Diff:
sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/StreamExecution.scala
---
@@ -284,42 +284,38 @@ class StreamExecution(
triggerExecutor.execute(() => {
startTrigger()
- val continueToRun =
- if (isActive) {
- reportTimeTaken("triggerExecution") {
- if (currentBatchId < 0) {
- // We'll do this initialization only once
- populateStartOffsets(sparkSessionToRunBatches)
- logDebug(s"Stream running from $committedOffsets to
$availableOffsets")
- } else {
- constructNextBatch()
- }
- if (dataAvailable) {
- currentStatus = currentStatus.copy(isDataAvailable =
true)
- updateStatusMessage("Processing new data")
- runBatch(sparkSessionToRunBatches)
- }
+ if (isActive) {
+ reportTimeTaken("triggerExecution") {
+ if (currentBatchId < 0) {
+ // We'll do this initialization only once
+ populateStartOffsets(sparkSessionToRunBatches)
+ logDebug(s"Stream running from $committedOffsets to
$availableOffsets")
+ } else {
+ constructNextBatch()
}
- // Report trigger as finished and construct progress object.
- finishTrigger(dataAvailable)
if (dataAvailable) {
- // Update committed offsets.
- batchCommitLog.add(currentBatchId)
- committedOffsets ++= availableOffsets
- logDebug(s"batch ${currentBatchId} committed")
- // We'll increase currentBatchId after we complete
processing current batch's data
- currentBatchId += 1
- } else {
- currentStatus = currentStatus.copy(isDataAvailable = false)
- updateStatusMessage("Waiting for data to arrive")
- Thread.sleep(pollingDelayMs)
+ currentStatus = currentStatus.copy(isDataAvailable = true)
+ updateStatusMessage("Processing new data")
+ runBatch(sparkSessionToRunBatches)
}
- true
+ }
+ // Report trigger as finished and construct progress object.
+ finishTrigger(dataAvailable)
--- End diff --
I don't think I moved it out. Is the diff and whitespace confusing?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
