Skip to content

[SPARK-12987][SQL]Fixing the name resolution in drop column #11009

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

[SPARK-12987][SQL]Fixing the name resolution in drop column #11009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff187c3
Fixing the name resolution in drop column
kevinyu98 Feb 2, 2016
fb59a8a
fixing code review comments
kevinyu98 Feb 3, 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
6 changes: 5 additions & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1256,8 +1256,12 @@ class DataFrame private[sql](
@scala.annotation.varargs
def drop(colNames: String*): DataFrame = {
val resolver = sqlContext.analyzer.resolver

val remainingCols =
schema.filter(f => colNames.forall(n => !resolver(f.name, n))).map(f => Column(f.name))
schema.filter(f => colNames.forall(n => !resolver(f.name, n)))
Copy link
Contributor

@marmbrus marmbrus Feb 2, 2016

Choose a reason for hiding this comment

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

super nit: i would consider breaking before the filter also if you have to break for the map. otherwise the filter looks special when really you are just chaining a bunch of operations.

.map(f => Column(UnresolvedAttribute.quoted(f.name)))


if (remainingCols.size == this.schema.size) {
this
} else {
Expand Down
8 changes: 8 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import org.apache.spark.sql.types._
class DataFrameSuite extends QueryTest with SharedSQLContext {
import testImplicits._


test("analysis error should be eagerly reported") {
// Eager analysis.
withSQLConf(SQLConf.DATAFRAME_EAGER_ANALYSIS.key -> "true") {
Expand Down Expand Up @@ -1291,4 +1292,11 @@ class DataFrameSuite extends QueryTest with SharedSQLContext {
Seq(1 -> "a").toDF("i", "j").filter($"i".cast(StringType) === "1"),
Row(1, "a"))
}

test("SPARK-12987: drop column ") {
val df = Seq((1, 2)).toDF("a_b", "a.c")
val df1 = df.drop("a_b")
checkAnswer(df1, Row(2))
assert(df1.schema.map(_.name) === Seq("a.c"))
}
}