You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2015/07/01 19:31:42 UTC
spark git commit: [SPARK-8621] [SQL] support empty string as column
name
Repository: spark
Updated Branches:
refs/heads/master 4137f769b -> 31b4a3d7f
[SPARK-8621] [SQL] support empty string as column name
improve the empty check in `parseAttributeName` so that we can allow empty string as column name.
Close https://github.com/apache/spark/pull/7117
Author: Wenchen Fan <cl...@outlook.com>
Closes #7149 from cloud-fan/8621 and squashes the following commits:
efa9e3e [Wenchen Fan] support empty string
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/31b4a3d7
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/31b4a3d7
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/31b4a3d7
Branch: refs/heads/master
Commit: 31b4a3d7f2be9053a041e5ae67418562a93d80d8
Parents: 4137f76
Author: Wenchen Fan <cl...@outlook.com>
Authored: Wed Jul 1 10:31:35 2015 -0700
Committer: Reynold Xin <rx...@databricks.com>
Committed: Wed Jul 1 10:31:35 2015 -0700
----------------------------------------------------------------------
.../apache/spark/sql/catalyst/plans/logical/LogicalPlan.scala | 4 ++--
.../src/test/scala/org/apache/spark/sql/DataFrameSuite.scala | 7 +++++++
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/31b4a3d7/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/LogicalPlan.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/LogicalPlan.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/LogicalPlan.scala
index b009a20..e911b90 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/LogicalPlan.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/LogicalPlan.scala
@@ -161,7 +161,7 @@ abstract class LogicalPlan extends QueryPlan[LogicalPlan] with Logging {
if (tmp.nonEmpty) throw e
inBacktick = true
} else if (char == '.') {
- if (tmp.isEmpty) throw e
+ if (name(i - 1) == '.' || i == name.length - 1) throw e
nameParts += tmp.mkString
tmp.clear()
} else {
@@ -170,7 +170,7 @@ abstract class LogicalPlan extends QueryPlan[LogicalPlan] with Logging {
}
i += 1
}
- if (tmp.isEmpty || inBacktick) throw e
+ if (inBacktick) throw e
nameParts += tmp.mkString
nameParts.toSeq
}
http://git-wip-us.apache.org/repos/asf/spark/blob/31b4a3d7/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala
index 50d324c..afb1cf5 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala
@@ -730,4 +730,11 @@ class DataFrameSuite extends QueryTest {
val res11 = ctx.range(-1).select("id")
assert(res11.count == 0)
}
+
+ test("SPARK-8621: support empty string column name") {
+ val df = Seq(Tuple1(1)).toDF("").as("t")
+ // We should allow empty string as column name
+ df.col("")
+ df.col("t.``")
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org