Skip to content

[SPARK-13721][SQL] Make GeneratorOuter unresolved. #17026

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

[SPARK-13721][SQL] Make GeneratorOuter unresolved. #17026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2cb7552
[SPARK-13721][SQL] Make GeneratorOuter unresolved.
rxin Feb 16, 2017
4e819a0
fix ResolveAliases
bogdanrdc Feb 22, 2017
5e25c63
Merge remote-tracking branch 'upstream/master' into PR16958
bogdanrdc Feb 22, 2017
c6e8807
space
bogdanrdc Feb 22, 2017
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
2 changes: 1 addition & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ class Analyzer(
expr.transformUp { case u @ UnresolvedAlias(child, optGenAliasFunc) =>
child match {
case ne: NamedExpression => ne
case go @ GeneratorOuter(g: Generator) if g.resolved => MultiAlias(go, Nil)
case e if !e.resolved => u
case g: Generator => MultiAlias(g, Nil)
case c @ Cast(ne: NamedExpression, _, _) => Alias(c, ne.name)()
Expand Down Expand Up @@ -1665,7 +1666,6 @@ class Analyzer(
var resolvedGenerator: Generate = null

val newProjectList = projectList.flatMap {

case AliasedGenerator(generator, names, outer) if generator.childrenResolved =>
// It's a sanity check, this should not happen as the previous case will throw
// exception earlier.
Expand Down
8 changes: 7 additions & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/generators.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ case class Stack(children: Seq[Expression]) extends Generator {
}
}


/**
* Only support code generation when stack produces 50 rows or less.
*/
Expand Down Expand Up @@ -204,6 +203,10 @@ case class Stack(children: Seq[Expression]) extends Generator {
}
}

/**
* Wrapper around another generator to specify outer behavior. This is used to implement functions
* such as explode_outer. This expression gets replaced during analysis.
*/
case class GeneratorOuter(child: Generator) extends UnaryExpression with Generator {
final override def eval(input: InternalRow = null): TraversableOnce[InternalRow] =
throw new UnsupportedOperationException(s"Cannot evaluate expression: $this")
Expand All @@ -212,7 +215,10 @@ case class GeneratorOuter(child: Generator) extends UnaryExpression with Generat
throw new UnsupportedOperationException(s"Cannot evaluate expression: $this")

override def elementSchema: StructType = child.elementSchema

override lazy val resolved: Boolean = false
}

/**
* A base class for [[Explode]] and [[PosExplode]].
*/
Expand Down