Skip to content

[SPARK-34473][SQL] Avoid NPE in DataFrameReader.schema(StructType) #31593

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
cloud-fan wants to merge 3 commits into from
Closed

[SPARK-34473][SQL] Avoid NPE in DataFrameReader.schema(StructType) #31593

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8306ab2
avoid NPE in DataFrameReader.schema(StructType)
cloud-fan Feb 19, 2021
8a38f52
update streaming side
cloud-fan Feb 22, 2021
643f002
address comments
cloud-fan Feb 22, 2021
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
Prev Previous commit
Next Next commit
update streaming side
  • Loading branch information
@cloud-fan
cloud-fan committed Feb 22, 2021
commit 8a38f52f293daa520dde845949fd8449ebaa682f
6 changes: 4 additions & 2 deletions sql/core/src/main/scala/org/apache/spark/sql/streaming/DataStreamReader.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,10 @@ final class DataStreamReader private[sql](sparkSession: SparkSession) extends Lo
* @since 2.0.0
*/
def schema(schema: StructType): DataStreamReader = {
val replaced = CharVarcharUtils.failIfHasCharVarchar(schema).asInstanceOf[StructType]
this.userSpecifiedSchema = Option(replaced)
if (schema != null) {
val replaced = CharVarcharUtils.failIfHasCharVarchar(schema).asInstanceOf[StructType]
this.userSpecifiedSchema = Option(replaced)
}
Copy link
Member

@dongjoon-hyun dongjoon-hyun Feb 22, 2021

Choose a reason for hiding this comment

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

Shall we change line 81~86 together?

Copy link
Member

@yaooqinn yaooqinn Feb 22, 2021

Choose a reason for hiding this comment

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

+1

this
}

Expand Down