Skip to content

[SPARK-24339][SQL]Add project for transform/map/reduce sql to prune column #21447

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

[SPARK-24339][SQL]Add project for transform/map/reduce sql to prune column #21447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
11c5c57
Add project for tranform/map/reduce sql to prune column
xdcjie May 29, 2018
083e0c9
Add project for tranform/map/reduce sql to prune column
xdcjie May 29, 2018
3997ceb
fix unbound wildcard type compile error
xdcjie May 31, 2018
958888b
fix scala style
xdcjie Jul 12, 2018
59aa599
Merge branch 'branch-2.2' of https://github.com/apache/spark into bra…
xdcjie Jul 15, 2018
4f6ec24
Merge branch 'branch-2.2' of https://github.com/apache/spark into bra…
xdcjie Jul 16, 2018
12b688d
update scala style
xdcjie Jul 16, 2018
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
13 changes: 12 additions & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,17 @@ class AstBuilder(conf: SQLConf) extends SqlBaseBaseVisitor[AnyRef] with Logging
// Add where.
val withFilter = relation.optionalMap(where)(filter)

// Add project.
val namedExpressions = expressions.map {
case e: NamedExpression => e
case e: Expression => UnresolvedAlias(e)
Copy link
Member

@maropu maropu May 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: case e: _ => UnresolvedAlias(e)

Copy link
Author

@xdcjie xdcjie May 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the type of expressions is Expression, so i think
case e: _ => UnresolvedAlias(e) and case e: Expression => UnresolvedAlias(e) is equivalent.
Did have other reasons to change this?

Copy link
Member

@maropu maropu May 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just a style issue.

Copy link
Author

@xdcjie xdcjie May 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The style is updated, review this, please.

Copy link
Author

@xdcjie xdcjie May 31, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried, "case e: _ => UnresolveAlias(e)" will occur "unbound wildcard type" complie error. I will revert to "case e: Expression => UnresolvedAlias(e)".

}
val withProject = if (namedExpressions.nonEmpty) {
Project(namedExpressions, withFilter)
} else {
withFilter
}

// Create the attributes.
val (attributes, schemaLess) = if (colTypeList != null) {
// Typed return columns.
Expand All @@ -358,7 +369,7 @@ class AstBuilder(conf: SQLConf) extends SqlBaseBaseVisitor[AnyRef] with Logging
expressions,
string(script),
attributes,
withFilter,
withProject,
withScriptIOSchema(
ctx, inRowFormat, recordWriter, outRowFormat, recordReader, schemaLess))

Expand Down
12 changes: 9 additions & 3 deletions sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveDDLCommandSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,11 +265,17 @@ class HiveDDLCommandSuite extends PlanTest with SQLTestUtils with TestHiveSingle
"func", Seq.empty, plans.table("e"), null)

comparePlans(plan1,
p.copy(child = p.child.where('f < 10), output = Seq('key.string, 'value.string)))
p.copy(
child = p.child.where('f < 10).select(UnresolvedAttribute("a"), UnresolvedAttribute("b")),
output = Seq('key.string, 'value.string)))
comparePlans(plan2,
p.copy(output = Seq('c.string, 'd.string)))
p.copy(
child = p.child.select(UnresolvedAttribute("a"), UnresolvedAttribute("b")),
output = Seq('c.string, 'd.string)))
comparePlans(plan3,
p.copy(output = Seq('c.int, 'd.decimal(10, 0))))
p.copy(
child = p.child.select(UnresolvedAttribute("a"), UnresolvedAttribute("b")),
output = Seq('c.int, 'd.decimal(10, 0))))
}

test("use backticks in output of Script Transform") {
Expand Down