Skip to content

[SPARK-18729][SS]Move DataFrame.collect out of synchronized block in MemorySink #16162

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
zsxwing wants to merge 1 commit into from
Closed

[SPARK-18729][SS]Move DataFrame.collect out of synchronized block in MemorySink #16162

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
Move DataFrame.collect out of synchronized block in MemorySink
  • Loading branch information
@zsxwing
zsxwing committed Dec 5, 2016
commit 020495b8b7a3f712b9a78ad5fd21a7a5f37051c9
19 changes: 13 additions & 6 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/memory.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,16 +186,23 @@ class MemorySink(val schema: StructType, outputMode: OutputMode) extends Sink wi
}.mkString("\n")
}

override def addBatch(batchId: Long, data: DataFrame): Unit = synchronized {
if (latestBatchId.isEmpty || batchId > latestBatchId.get) {
override def addBatch(batchId: Long, data: DataFrame): Unit = {
val notCommitted = synchronized {
latestBatchId.isEmpty || batchId > latestBatchId.get
}
if (notCommitted) {
logDebug(s"Committing batch $batchId to $this")
outputMode match {
case InternalOutputModes.Append | InternalOutputModes.Update =>
batches.append(AddedData(batchId, data.collect()))
val rows = AddedData(batchId, data.collect())
synchronized { batches += rows }

case InternalOutputModes.Complete =>
batches.clear()
batches += AddedData(batchId, data.collect())
val rows = AddedData(batchId, data.collect())
synchronized {
batches.clear()
batches += rows
}

case _ =>
throw new IllegalArgumentException(
Expand All @@ -206,7 +213,7 @@ class MemorySink(val schema: StructType, outputMode: OutputMode) extends Sink wi
}
}

def clear(): Unit = {
def clear(): Unit = synchronized {
batches.clear()
}

Expand Down