Skip to content
Snippets Groups Projects
Commit 74c4e265 authored by Wenchen Fan's avatar Wenchen Fan
Browse files

[HOT-FIX] fix compile

Fix the compilation failure introduced by https://github.com/apache/spark/pull/11555 because of a merge conflict.

Author: Wenchen Fan <wenchen@databricks.com>

Closes #11648 from cloud-fan/hotbug.
parent 6871cc8f
No related branches found
No related tags found
No related merge requests found
...@@ -356,7 +356,7 @@ class SQLBuilder(logicalPlan: LogicalPlan, sqlContext: SQLContext) extends Loggi ...@@ -356,7 +356,7 @@ class SQLBuilder(logicalPlan: LogicalPlan, sqlContext: SQLContext) extends Loggi
// +- MetastoreRelation default, src, None // +- MetastoreRelation default, src, None
case plan @ Project(_, Filter(_, _: Aggregate)) => wrapChildWithSubquery(plan) case plan @ Project(_, Filter(_, _: Aggregate)) => wrapChildWithSubquery(plan)
case w @ Window(_, _, _, _, Filter(_, _: Aggregate)) => wrapChildWithSubquery(w) case w @ Window(_, _, _, Filter(_, _: Aggregate)) => wrapChildWithSubquery(w)
case plan @ Project(_, case plan @ Project(_,
_: SubqueryAlias _: SubqueryAlias
...@@ -373,7 +373,7 @@ class SQLBuilder(logicalPlan: LogicalPlan, sqlContext: SQLContext) extends Loggi ...@@ -373,7 +373,7 @@ class SQLBuilder(logicalPlan: LogicalPlan, sqlContext: SQLContext) extends Loggi
// We will generate "SELECT ... FROM ..." for Window operator, so its child operator should // We will generate "SELECT ... FROM ..." for Window operator, so its child operator should
// be able to put in the FROM clause, or we wrap it with a subquery. // be able to put in the FROM clause, or we wrap it with a subquery.
case w @ Window(_, _, _, _, case w @ Window(_, _, _,
_: SubqueryAlias _: SubqueryAlias
| _: Filter | _: Filter
| _: Join | _: Join
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment