Skip to content
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

[SPARK-20270][SQL] na.fill should not change the values in long or integer when the default value is in double #17577

Closed
wants to merge 3 commits into from
Closed

[SPARK-20270][SQL] na.fill should not change the values in long or integer when the default value is in double #17577

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb54407
na.fill will change the values in long or integer when the default va…
Apr 9, 2017
42c9eb0
Fix the test
Apr 9, 2017
3fb1a66
address feedback
Apr 9, 2017
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
5 changes: 3 additions & 2 deletions sql/core/src/main/scala/org/apache/spark/sql/DataFrameNaFunctions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,10 +407,11 @@ final class DataFrameNaFunctions private[sql](df: DataFrame) {
val quotedColName = "`" + col.name + "`"
val colValue = col.dataType match {
case DoubleType | FloatType =>
nanvl(df.col(quotedColName), lit(null)) // nanvl only supports these types
// nanvl only supports these types
nanvl(df.col(quotedColName), lit(null).cast(col.dataType))
Copy link
Member

Choose a reason for hiding this comment

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

This is a good change, but the test case is missing. To ensure this will not be changed by others in the future, could you also add another test case? For example,

    checkAnswer(
      Seq[(java.lang.Long, java.lang.Float)]((null, 3.14f), (9123146099426677101L, null),
        (9123146560113991650L, 1.6f), (null, null)).toDF("a", "b").na.fill(0.2),
      Row(0, 3.14f) :: Row(9123146099426677101L, 0.2f) :: Row(9123146560113991650L, 1.6f)
        :: Row(0, 0.2f) :: Nil
    )

Copy link
Member Author

Choose a reason for hiding this comment

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

The float one is covered by another test in fill with map, but still nice to have them explicitly to avoid being changed unexpectedly.

case _ => df.col(quotedColName)
}
coalesce(colValue, lit(replacement)).cast(col.dataType).as(col.name)
coalesce(colValue, lit(replacement).cast(col.dataType)).as(col.name)
}

/**
Expand Down
7 changes: 7 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/DataFrameNaFunctionsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,13 @@ class DataFrameNaFunctionsSuite extends QueryTest with SharedSQLContext {
Row(1, 2) :: Row(-1, -2) :: Row(9123146099426677101L, 9123146560113991650L) :: Nil
)

checkAnswer(
Seq[(java.lang.Long, java.lang.Double)]((null, 3.14), (9123146099426677101L, null),
(9123146560113991650L, 1.6), (null, null)).toDF("a", "b").na.fill(0.2),
Row(0, 3.14) :: Row(9123146099426677101L, 0.2) :: Row(9123146560113991650L, 1.6)
:: Row(0, 0.2) :: Nil
)

checkAnswer(
Seq[(java.lang.Long, java.lang.Double)]((null, 1.23), (3L, null), (4L, 3.45))
.toDF("a", "b").na.fill(2.34),
Expand Down