Skip to content

[SPARK-23399][SQL] Register a task completion listener first for OrcColumnarBatchReader #20590

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

[SPARK-23399][SQL] Register a task completion listener first for OrcColumnarBatchReader #20590

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
198f186
[SPARK-23399][SQL] Register a task completion listner first for OrcCo…
dongjoon-hyun Feb 12, 2018
3b8cb0a
Add a manual test case.
dongjoon-hyun Feb 13, 2018
d4cc32e
fix typo
dongjoon-hyun Feb 13, 2018
5a9fa0b
Remove test case.
dongjoon-hyun Feb 13, 2018
18c2485
Add comments.
dongjoon-hyun Feb 13, 2018
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/datasources/orc/OrcFileFormat.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,12 @@ class OrcFileFormat
if (enableVectorizedReader) {
val batchReader = new OrcColumnarBatchReader(
enableOffHeapColumnVector && taskContext.isDefined, copyToSpark, capacity)
// SPARK-23399 Register a task completion listener first to call `close()` in all cases.
// There is a possibility that `initialize` and `initBatch` hit some errors (like OOM)
// after opening a file.
val iter = new RecordReaderIterator(batchReader)
Option(TaskContext.get()).foreach(_.addTaskCompletionListener(_ => iter.close()))

batchReader.initialize(fileSplit, taskAttemptContext)
batchReader.initBatch(
reader.getSchema,
Expand All @@ -196,8 +202,6 @@ class OrcFileFormat
partitionSchema,
file.partitionValues)

val iter = new RecordReaderIterator(batchReader)
Option(TaskContext.get()).foreach(_.addTaskCompletionListener(_ => iter.close()))
iter.asInstanceOf[Iterator[InternalRow]]
} else {
val orcRecordReader = new OrcInputFormat[OrcStruct]
Expand Down