Skip to content

[SPARK-18269][SQL] CSV datasource should read null properly when schema is lager than parsed tokens #15767

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

[SPARK-18269][SQL] CSV datasource should read null properly when schema is lager than parsed tokens #15767

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3692099
Take the case of null into account
HyukjinKwon Nov 4, 2016
e1c58c1
minimise the change
HyukjinKwon Nov 4, 2016
4132075
Indentation
HyukjinKwon Nov 4, 2016
c0667d1
Make the condition better
HyukjinKwon Nov 5, 2016
b913eac
No extra change
HyukjinKwon Nov 5, 2016
e5146e3
address the comment for condition and exception
HyukjinKwon Nov 5, 2016
aa89171
Print field name in the exception message
HyukjinKwon Nov 6, 2016
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
3 changes: 2 additions & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/csv/CSVInferSchema.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,8 @@ private[csv] object CSVTypeCast {
nullable: Boolean = true,
options: CSVOptions = CSVOptions()): Any = {

if (nullable && datum == options.nullValue) {
val isNull = datum == options.nullValue || datum == null
if (nullable && isNull) {
Copy link
Contributor

@rxin rxin Nov 5, 2016

Choose a reason for hiding this comment

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

isn't this more clear if you do

// datum can be null if the number of fields found is less than the length of the schema
if (datum == options.nullValue || datum == null) {
  if (!nullable) {
    throw some exception saying field is not null but null value found
  }
  null
} else {
  ..
}

Copy link
Contributor

@rxin rxin Nov 5, 2016

Choose a reason for hiding this comment

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

I'd also add a null validation test.

Copy link
Member Author

@HyukjinKwon HyukjinKwon Nov 5, 2016

Choose a reason for hiding this comment

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

Sure, I will.

null
} else {
castType match {
Expand Down
15 changes: 15 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/csv/CSVSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,4 +890,19 @@ class CSVSuite extends QueryTest with SharedSQLContext with SQLTestUtils {
}
}
}

test("load null when the schema is larger than parsed tokens ") {
withTempPath { path =>
Seq("1").toDF().write.text(path.getAbsolutePath)
val schema = StructType(
StructField("a", IntegerType, true) ::
StructField("b", IntegerType, true) :: Nil)
val df = spark.read
.schema(schema)
.option("header", "false")
.csv(path.getAbsolutePath)

checkAnswer(df, Row(1, null))
}
}
}
2 changes: 2 additions & 0 deletions ...core/src/test/scala/org/apache/spark/sql/execution/datasources/csv/CSVTypeCastSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ class CSVTypeCastSuite extends SparkFunSuite {
CSVTypeCast.castTo("-", DateType, nullable = true, CSVOptions("nullValue", "-")))
assertNull(
CSVTypeCast.castTo("-", StringType, nullable = true, CSVOptions("nullValue", "-")))
assertNull(
CSVTypeCast.castTo(null, IntegerType, nullable = true, CSVOptions("nullValue", "-")))
}

test("String type should also respect `nullValue`") {
Expand Down