Skip to content

[SPARK-46633][SQL] Fix Avro reader to handle zero-length blocks #44635

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

[SPARK-46633][SQL] Fix Avro reader to handle zero-length blocks #44635

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
9 changes: 6 additions & 3 deletions connector/avro/src/main/scala/org/apache/spark/sql/avro/AvroUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,16 +182,19 @@ private[sql] object AvroUtils extends Logging {

def hasNextRow: Boolean = {
while (!completed && currentRow.isEmpty) {
val r = fileReader.hasNext && !fileReader.pastSync(stopPosition)
if (!r) {
if (fileReader.pastSync(stopPosition)) {
fileReader.close()
completed = true
currentRow = None
} else {
} else if (fileReader.hasNext()) {
val record = fileReader.next()
// the row must be deserialized in hasNextRow, because AvroDeserializer#deserialize
// potentially filters rows
currentRow = deserializer.deserialize(record).asInstanceOf[Option[InternalRow]]
} else {
// In this case, `fileReader.hasNext()` returns false but we are not past sync point yet.
// This means empty blocks, we need to continue reading the file in case there are non
// empty blocks or we are past sync point.
}
}
currentRow.isDefined
Expand Down
Loading