Skip to content

[SPARK-29063][SQL] Modify fillValue approach to support joined dataframe #25768

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

[SPARK-29063][SQL] Modify fillValue approach to support joined dataframe #25768

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3602807
Modify fillValue approach to support joined dataframe
xuanyuanking Sep 12, 2019
03305be
Add test for checking ambiguous field
xuanyuanking Sep 17, 2019
59106dc
simplify
gatorsmile Sep 20, 2019
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
Add test for checking ambiguous field
  • Loading branch information
@xuanyuanking
xuanyuanking committed Sep 17, 2019
commit 03305bea4e8663f7bcd12963b489b1e8755c382f
17 changes: 16 additions & 1 deletion 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 @@ -231,7 +231,7 @@ class DataFrameNaFunctionsSuite extends QueryTest with SharedSparkSession {
}
}

test("fill for join operation") {
def createDFsWithSameFieldsName(): (DataFrame, DataFrame) = {
val df1 = Seq(
("f1-1", "f2", null),
("f1-2", null, null),
Expand All @@ -243,6 +243,11 @@ class DataFrameNaFunctionsSuite extends QueryTest with SharedSparkSession {
("f1-2", "f2", null),
("f1-3", "f2", "f4-1")
).toDF("f1", "f2", "f4")
(df1, df2)
}

test("fill unambiguous field for join operation") {
val (df1, df2) = createDFsWithSameFieldsName()
val joined_df = df1.join(df2, Seq("f1"), joinType = "left_outer")
checkAnswer(joined_df.na.fill("", cols = Seq("f4")),
Row("f1-1", "f2", null, null, "") ::
Expand All @@ -251,6 +256,16 @@ class DataFrameNaFunctionsSuite extends QueryTest with SharedSparkSession {
Row("f1-4", "f2", "f3-1", null, "") :: Nil)
}

test("fill ambiguous field for join operation") {
val (df1, df2) = createDFsWithSameFieldsName()
val joined_df = df1.join(df2, Seq("f1"), joinType = "left_outer")

val message = intercept[AnalysisException] {
joined_df.na.fill("", cols = Seq("f2"))
}.getMessage
assert(message.contains("Reference 'f2' is ambiguous"))
}

test("replace") {
val input = createDF()

Expand Down