gatorsmile commented on a change in pull request #26738: [SPARK-30082][SQL] Do
not replace Zeros when replacing NaNs
URL: https://github.com/apache/spark/pull/26738#discussion_r361889612
##########
File path:
sql/core/src/main/scala/org/apache/spark/sql/DataFrameNaFunctions.scala
##########
@@ -456,7 +456,7 @@ final class DataFrameNaFunctions private[sql](df:
DataFrame) {
val keyExpr = df.col(col.name).expr
def buildExpr(v: Any) = Cast(Literal(v), keyExpr.dataType)
val branches = replacementMap.flatMap { case (source, target) =>
- Seq(buildExpr(source), buildExpr(target))
+ Seq(Literal(source), buildExpr(target))
Review comment:
Before this PR,
```
+---+----+-----+----+-----+------+
|int|long|short|byte|float|double|
+---+----+-----+----+-----+------+
| 9| 9| 9| 9| 2.0| 2.0|
+---+----+-----+----+-----+------+
== Parsed Logical Plan ==
Project [CASE WHEN (int#99 = cast(2.3 as int)) THEN cast(9.0 as int) ELSE
int#99 END AS int#117, CASE WHEN (long#100L = cast(2.3 as bigint)) THEN
cast(9.0 as bigint) ELSE long#100L END AS long#118L, CASE WHEN (short#101 =
cast(2.3 as smallint)) THEN cast(9.0 as smallint) ELSE short#101 END AS
short#119, CASE WHEN (byte#102 = cast(2.3 as tinyint)) THEN cast(9.0 as
tinyint) ELSE byte#102 END AS byte#120, CASE WHEN (float#103 = cast(2.3 as
float)) THEN cast(9.0 as float) ELSE float#103 END AS float#121, CASE WHEN
(double#104 = cast(2.3 as double)) THEN cast(9.0 as double) ELSE double#104 END
AS double#122]
+- Project [_1#86 AS int#99, _2#87L AS long#100L, _3#88 AS short#101, _4#89
AS byte#102, _5#90 AS float#103, _6#91 AS double#104]
+- LocalRelation [_1#86, _2#87L, _3#88, _4#89, _5#90, _6#91]
== Analyzed Logical Plan ==
int: int, long: bigint, short: smallint, byte: tinyint, float: float,
double: double
Project [CASE WHEN (int#99 = cast(2.3 as int)) THEN cast(9.0 as int) ELSE
int#99 END AS int#117, CASE WHEN (long#100L = cast(2.3 as bigint)) THEN
cast(9.0 as bigint) ELSE long#100L END AS long#118L, CASE WHEN (short#101 =
cast(2.3 as smallint)) THEN cast(9.0 as smallint) ELSE short#101 END AS
short#119, CASE WHEN (byte#102 = cast(2.3 as tinyint)) THEN cast(9.0 as
tinyint) ELSE byte#102 END AS byte#120, CASE WHEN (float#103 = cast(2.3 as
float)) THEN cast(9.0 as float) ELSE float#103 END AS float#121, CASE WHEN
(double#104 = cast(2.3 as double)) THEN cast(9.0 as double) ELSE double#104 END
AS double#122]
+- Project [_1#86 AS int#99, _2#87L AS long#100L, _3#88 AS short#101, _4#89
AS byte#102, _5#90 AS float#103, _6#91 AS double#104]
+- LocalRelation [_1#86, _2#87L, _3#88, _4#89, _5#90, _6#91]
== Optimized Logical Plan ==
Project [CASE WHEN (_1#86 = 2) THEN 9 ELSE _1#86 END AS int#117, CASE WHEN
(_2#87L = 2) THEN 9 ELSE _2#87L END AS long#118L, CASE WHEN (_3#88 = 2) THEN 9
ELSE _3#88 END AS short#119, CASE WHEN (_4#89 = 2) THEN 9 ELSE _4#89 END AS
byte#120, CASE WHEN (_5#90 = 2.3) THEN 9.0 ELSE _5#90 END AS float#121, CASE
WHEN (_6#91 = 2.3) THEN 9.0 ELSE _6#91 END AS double#122]
+- LocalRelation [_1#86, _2#87L, _3#88, _4#89, _5#90, _6#91]
== Physical Plan ==
*(1) Project [CASE WHEN (_1#86 = 2) THEN 9 ELSE _1#86 END AS int#117, CASE
WHEN (_2#87L = 2) THEN 9 ELSE _2#87L END AS long#118L, CASE WHEN (_3#88 = 2)
THEN 9 ELSE _3#88 END AS short#119, CASE WHEN (_4#89 = 2) THEN 9 ELSE _4#89 END
AS byte#120, CASE WHEN (_5#90 = 2.3) THEN 9.0 ELSE _5#90 END AS float#121, CASE
WHEN (_6#91 = 2.3) THEN 9.0 ELSE _6#91 END AS double#122]
+- *(1) LocalTableScan [_1#86, _2#87L, _3#88, _4#89, _5#90, _6#91]
```
After this PR,
```
+---+----+-----+----+-----+------+
|int|long|short|byte|float|double|
+---+----+-----+----+-----+------+
| 2| 2| 2| 2| 2.0| 2.0|
+---+----+-----+----+-----+------+
== Parsed Logical Plan ==
'Project [CASE WHEN (int#99 = 2.3) THEN cast(9.0 as int) ELSE int#99 END AS
int#117, CASE WHEN (long#100L = 2.3) THEN cast(9.0 as bigint) ELSE long#100L
END AS long#118, CASE WHEN (short#101 = 2.3) THEN cast(9.0 as smallint) ELSE
short#101 END AS short#119, CASE WHEN (byte#102 = 2.3) THEN cast(9.0 as
tinyint) ELSE byte#102 END AS byte#120, CASE WHEN (float#103 = 2.3) THEN
cast(9.0 as float) ELSE float#103 END AS float#121, CASE WHEN (double#104 =
2.3) THEN cast(9.0 as double) ELSE double#104 END AS double#122]
+- Project [_1#86 AS int#99, _2#87L AS long#100L, _3#88 AS short#101, _4#89
AS byte#102, _5#90 AS float#103, _6#91 AS double#104]
+- LocalRelation [_1#86, _2#87L, _3#88, _4#89, _5#90, _6#91]
== Analyzed Logical Plan ==
int: int, long: bigint, short: smallint, byte: tinyint, float: float,
double: double
Project [CASE WHEN (cast(int#99 as double) = 2.3) THEN cast(9.0 as int) ELSE
int#99 END AS int#117, CASE WHEN (cast(long#100L as double) = 2.3) THEN
cast(9.0 as bigint) ELSE long#100L END AS long#118L, CASE WHEN (cast(short#101
as double) = 2.3) THEN cast(9.0 as smallint) ELSE short#101 END AS short#119,
CASE WHEN (cast(byte#102 as double) = 2.3) THEN cast(9.0 as tinyint) ELSE
byte#102 END AS byte#120, CASE WHEN (cast(float#103 as double) = 2.3) THEN
cast(9.0 as float) ELSE float#103 END AS float#121, CASE WHEN (double#104 =
2.3) THEN cast(9.0 as double) ELSE double#104 END AS double#122]
+- Project [_1#86 AS int#99, _2#87L AS long#100L, _3#88 AS short#101, _4#89
AS byte#102, _5#90 AS float#103, _6#91 AS double#104]
+- LocalRelation [_1#86, _2#87L, _3#88, _4#89, _5#90, _6#91]
== Optimized Logical Plan ==
Project [CASE WHEN (cast(_1#86 as double) = 2.3) THEN 9 ELSE _1#86 END AS
int#117, CASE WHEN (cast(_2#87L as double) = 2.3) THEN 9 ELSE _2#87L END AS
long#118L, CASE WHEN (cast(_3#88 as double) = 2.3) THEN 9 ELSE _3#88 END AS
short#119, CASE WHEN (cast(_4#89 as double) = 2.3) THEN 9 ELSE _4#89 END AS
byte#120, CASE WHEN (cast(_5#90 as double) = 2.3) THEN 9.0 ELSE _5#90 END AS
float#121, CASE WHEN (_6#91 = 2.3) THEN 9.0 ELSE _6#91 END AS double#122]
+- LocalRelation [_1#86, _2#87L, _3#88, _4#89, _5#90, _6#91]
== Physical Plan ==
*(1) Project [CASE WHEN (cast(_1#86 as double) = 2.3) THEN 9 ELSE _1#86 END
AS int#117, CASE WHEN (cast(_2#87L as double) = 2.3) THEN 9 ELSE _2#87L END AS
long#118L, CASE WHEN (cast(_3#88 as double) = 2.3) THEN 9 ELSE _3#88 END AS
short#119, CASE WHEN (cast(_4#89 as double) = 2.3) THEN 9 ELSE _4#89 END AS
byte#120, CASE WHEN (cast(_5#90 as double) = 2.3) THEN 9.0 ELSE _5#90 END AS
float#121, CASE WHEN (_6#91 = 2.3) THEN 9.0 ELSE _6#91 END AS double#122]
+- *(1) LocalTableScan [_1#86, _2#87L, _3#88, _4#89, _5#90, _6#91]
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
