Skip to content

[SPARK-40294][SQL] Fix repeat calls to PartitionReader.hasNext timing out #37743

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
richardc-db wants to merge 2 commits into from
Closed

[SPARK-40294][SQL] Fix repeat calls to PartitionReader.hasNext timing out #37743

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c520456
fix repeat calls to hasNext
richardc-db Aug 31, 2022
fb7482a
trigger build
richardc-db Aug 31, 2022
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
6 changes: 5 additions & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/DataSourceRDD.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,16 @@ private class PartitionIterator[T](
reader: PartitionReader[T],
customMetrics: Map[String, SQLMetric]) extends Iterator[T] {
private[this] var valuePrepared = false
private[this] var prevHasNext = true
Copy link
Contributor

@cloud-fan cloud-fan Sep 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think hasMoreInput is a better name.

Copy link
Contributor

@beliefer beliefer Sep 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1


private var numRow = 0L

override def hasNext: Boolean = {
if (!valuePrepared) {
Copy link
Contributor

@cloud-fan cloud-fan Sep 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you follow the change in https://github.com/apache/spark/pull/37900/files ? It can avoid entering this if branch entirely.

valuePrepared = reader.next()
if (prevHasNext) {
prevHasNext = reader.next()
}
valuePrepared = prevHasNext
}
valuePrepared
}
Expand Down