Skip to content

[SPARK-59273][SQL][FOLLOWUP] Skip non-string columns in fill #58647

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
zhangxinyao88 wants to merge 1 commit into from
+14 −4
Closed

[SPARK-59273][SQL][FOLLOWUP] Skip non-string columns in fill #58647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions sql/core/src/main/scala/org/apache/spark/sql/classic/DataFrameNaFunctions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@ final class DataFrameNaFunctions private[sql](df: DataFrame)
val typeMatches = (targetType, col.dataType) match {
case (NumericType, dt) => dt.isInstanceOf[NumericType]
case (StringType, _: StringType) => true
case (StringType, _) => false
case (BooleanType, dt) => dt == BooleanType
case _ =>
throw new IllegalArgumentException(s"$targetType is not matched at fillValue")
Expand Down
17 changes: 13 additions & 4 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 @@ -22,7 +22,14 @@ import scala.jdk.CollectionConverters._
import org.apache.spark.SparkUnsupportedOperationException
import org.apache.spark.sql.internal.SQLConf
import org.apache.spark.sql.test.SharedSparkSession
import org.apache.spark.sql.types.{CharType, StringType, StructField, StructType, VarcharType}
import org.apache.spark.sql.types.{
CharType,
IntegerType,
StringType,
StructField,
StructType,
VarcharType
}

class DataFrameNaFunctionsSuite extends SharedSparkSession {
import testImplicits._
Expand Down Expand Up @@ -219,10 +226,12 @@ class DataFrameNaFunctionsSuite extends SharedSparkSession {
withSQLConf(SQLConf.CHAR_VARCHAR_STANDARD_SEMANTICS.key -> "true") {
val schema = StructType(Seq(
StructField("c", CharType(3)),
StructField("v", VarcharType(3))))
val input = spark.createDataFrame(sparkContext.parallelize(Seq(Row(null, null))), schema)
StructField("v", VarcharType(3)),
StructField("i", IntegerType)))
val input = spark.createDataFrame(
sparkContext.parallelize(Seq(Row(null, null, null))), schema)

checkAnswer(input.na.fill("x"), Row("x ", "x"))
checkAnswer(input.na.fill("x"), Row("x ", "x", null))
}
}

Expand Down