Repository: spark
Updated Branches:
refs/heads/master 7569cf6cb -> 608ecc512
[SPARK-18415][SQL] Weird Plan Output when CTE used in RunnableCommand
### What changes were proposed in this pull request?
Currently, when CTE is used in RunnableCommand, the Analyzer does not replace
the logical node `With`. The child plan of RunnableCommand is not resolved.
Thus, the output of the `With` plan node looks very confusing.
For example,
```
sql(
"""
|CREATE VIEW cte_view AS
|WITH w AS (SELECT 1 AS n), cte1 (select 2), cte2 as (select 3)
|SELECT n FROM w
""".stripMargin).explain()
```
The output is like
```
ExecutedCommand
+- CreateViewCommand `cte_view`, WITH w AS (SELECT 1 AS n), cte1 (select 2),
cte2 as (select 3)
SELECT n FROM w, false, false, PersistedView
+- 'With [(w,SubqueryAlias w
+- Project [1 AS n#16]
+- OneRowRelation$
), (cte1,'SubqueryAlias cte1
+- 'Project [unresolvedalias(2, None)]
+- OneRowRelation$
), (cte2,'SubqueryAlias cte2
+- 'Project [unresolvedalias(3, None)]
+- OneRowRelation$
)]
+- 'Project ['n]
+- 'UnresolvedRelation `w`
```
After the fix, the output is as shown below.
```
ExecutedCommand
+- CreateViewCommand `cte_view`, WITH w AS (SELECT 1 AS n), cte1 (select 2),
cte2 as (select 3)
SELECT n FROM w, false, false, PersistedView
+- CTE [w, cte1, cte2]
: :- SubqueryAlias w
: : +- Project [1 AS n#16]
: : +- OneRowRelation$
: :- 'SubqueryAlias cte1
: : +- 'Project [unresolvedalias(2, None)]
: : +- OneRowRelation$
: +- 'SubqueryAlias cte2
: +- 'Project [unresolvedalias(3, None)]
: +- OneRowRelation$
+- 'Project ['n]
+- 'UnresolvedRelation `w`
```
BTW, this PR also fixes the output of the view type.
### How was this patch tested?
Manual
Author: gatorsmile <gatorsm...@gmail.com>
Closes #15854 from gatorsmile/cteName.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/608ecc51
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/608ecc51
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/608ecc51
Branch: refs/heads/master
Commit: 608ecc512b759514c75a1b475582f237ed569f10
Parents: 7569cf6
Author: gatorsmile <gatorsm...@gmail.com>
Authored: Wed Nov 16 08:25:15 2016 -0800
Committer: Herman van Hovell <hvanhov...@databricks.com>
Committed: Wed Nov 16 08:25:15 2016 -0800
----------------------------------------------------------------------
.../sql/catalyst/plans/logical/basicLogicalOperators.scala | 8 ++++++++
.../scala/org/apache/spark/sql/execution/command/views.scala | 4 +++-
2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/608ecc51/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicLogicalOperators.scala
----------------------------------------------------------------------
diff --git
a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicLogicalOperators.scala
b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicLogicalOperators.scala
index 4dcc288..4e333d5 100644
---
a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicLogicalOperators.scala
+++
b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicLogicalOperators.scala
@@ -25,6 +25,7 @@ import org.apache.spark.sql.catalyst.expressions._
import org.apache.spark.sql.catalyst.expressions.aggregate.AggregateExpression
import org.apache.spark.sql.catalyst.plans._
import org.apache.spark.sql.types._
+import org.apache.spark.util.Utils
/**
* When planning take() or collect() operations, this special node that is
inserted at the top of
@@ -404,6 +405,13 @@ case class InsertIntoTable(
*/
case class With(child: LogicalPlan, cteRelations: Seq[(String,
SubqueryAlias)]) extends UnaryNode {
override def output: Seq[Attribute] = child.output
+
+ override def simpleString: String = {
+ val cteAliases = Utils.truncatedString(cteRelations.map(_._1), "[", ", ",
"]")
+ s"CTE $cteAliases"
+ }
+
+ override def innerChildren: Seq[QueryPlan[_]] = cteRelations.map(_._2)
}
case class WithWindowDefinition(
http://git-wip-us.apache.org/repos/asf/spark/blob/608ecc51/sql/core/src/main/scala/org/apache/spark/sql/execution/command/views.scala
----------------------------------------------------------------------
diff --git
a/sql/core/src/main/scala/org/apache/spark/sql/execution/command/views.scala
b/sql/core/src/main/scala/org/apache/spark/sql/execution/command/views.scala
index 30472ec..154141b 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/command/views.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/command/views.scala
@@ -33,7 +33,9 @@ import org.apache.spark.sql.types.MetadataBuilder
* ViewType is used to specify the expected view type when we want to create
or replace a view in
* [[CreateViewCommand]].
*/
-sealed trait ViewType
+sealed trait ViewType {
+ override def toString: String = getClass.getSimpleName.stripSuffix("$")
+}
/**
* LocalTempView means session-scoped local temporary views. Its lifetime is
the lifetime of the
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
