aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorWenchen Fan <cloud0fan@outlook.com>2015-07-01 10:31:35 -0700
committerReynold Xin <rxin@databricks.com>2015-07-01 10:31:35 -0700
commit31b4a3d7f2be9053a041e5ae67418562a93d80d8 (patch)
tree0a8c3ca3fa0f080f34032c1a433aeb07f98a25c7 /sql
parent4137f769b84300648ad933b0b3054d69a7316745 (diff)
downloadspark-31b4a3d7f2be9053a041e5ae67418562a93d80d8.tar.gz
spark-31b4a3d7f2be9053a041e5ae67418562a93d80d8.tar.bz2
spark-31b4a3d7f2be9053a041e5ae67418562a93d80d8.zip
[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 <cloud0fan@outlook.com> Closes #7149 from cloud-fan/8621 and squashes the following commits: efa9e3e [Wenchen Fan] support empty string
Diffstat (limited to 'sql')
-rw-r--r--sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/LogicalPlan.scala4
-rw-r--r--sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala7
2 files changed, 9 insertions, 2 deletions
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 b009a200b9..e911b907e8 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
}
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 50d324c068..afb1cf5f8d 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.``")
+ }
}