Skip to content
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

Jump to bottom

airframe-sql: Resolve columns from CTE inside AliasedRelation #3057

Merged
merged 3 commits into from
Jul 12, 2023
Merged

airframe-sql: Resolve columns from CTE inside AliasedRelation #3057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
adfea27
airframe-sql: Resolve columns from CTE inside AliasedRelation
takezoe Jul 11, 2023
3f1638f
Fixup
takezoe Jul 12, 2023
f387440
Fix some warnings in TypeResolver
takezoe Jul 12, 2023
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 airframe-parquet/src/main/scala/wvlet/airframe/parquet/ParquetQueryPlanner.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ object ParquetQueryPlanner extends LogSupport {
val queryPlan = ParquetQueryPlan(sql)

logicalPlan match {
case Project(input, Seq(AllColumns(None, _, _)), _) =>
case Project(input, Seq(AllColumns(None, _, _, _)), _) =>
parseRelation(input, queryPlan).selectAllColumns
case Project(input, selectItems, _) =>
val columns = selectItems.map {
Expand Down
2 changes: 1 addition & 1 deletion airframe-sql/src/main/scala/wvlet/airframe/sql/analyzer/SQLAnonymizer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ object SQLAnonymizer extends LogSupport {
} else {
None
}
val v = UnresolvedAttribute(qualifier, parts.last, u.nodeLocation)
val v = UnresolvedAttribute(qualifier, parts.last, None, u.nodeLocation)
m += u -> v
}
this
Expand Down
63 changes: 27 additions & 36 deletions airframe-sql/src/main/scala/wvlet/airframe/sql/analyzer/TypeResolver.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import wvlet.airframe.sql.model.LogicalPlan._
import wvlet.airframe.sql.model._
import wvlet.log.LogSupport

import scala.annotation.tailrec

/**
* Resolve untyped [[LogicalPlan]]s and [[Expression]]s into typed ones.
*/
Expand Down Expand Up @@ -95,9 +97,6 @@ object TypeResolver extends LogSupport {

/**
* Translate select i1, i2, ... group by 1, 2, ... query into select i1, i2, ... group by i1, i2
*
* @param context
* @return
*/
object resolveAggregationIndexes extends RewriteRule {
def apply(context: AnalyzerContext): PlanRewriter = {
Expand Down Expand Up @@ -125,9 +124,9 @@ object TypeResolver extends LogSupport {
inputs(index) match {
case a: AllColumns =>
resolveIndex(index, a.inputColumns)
case SingleColumn(expr, _, _) =>
case SingleColumn(expr, _, _, _) =>
expr
case Alias(_, _, expr, _) =>
case Alias(_, _, expr, _, _) =>
expr
case other =>
other
Expand All @@ -137,8 +136,6 @@ object TypeResolver extends LogSupport {

/**
* Resolve group by keys
* @param context
* @return
*/
object resolveAggregationKeys extends RewriteRule {
def apply(context: AnalyzerContext): PlanRewriter = {
Expand Down Expand Up @@ -171,6 +168,7 @@ object TypeResolver extends LogSupport {
s.copy(orderBy = resolvedSortItems)
}

@tailrec
private def resolveIndex(index: Int, inputs: Seq[Attribute]): Expression = {
inputs(index) match {
case a: AllColumns =>
Expand All @@ -197,8 +195,6 @@ object TypeResolver extends LogSupport {

/**
* Resolve TableRefs in a query inside WITH statement with CTERelationRef
* @param context
* @return
*/
object resolveCTETableRef extends RewriteRule {
def apply(context: AnalyzerContext): PlanRewriter = { case q @ Query(withQuery, body, _) =>
Expand All @@ -222,7 +218,7 @@ object TypeResolver extends LogSupport {
case Some(cte) =>
CTERelationRef(
qname.fullName,
cte.outputAttributes.map(_.withQualifier(qname.fullName)),
cte.outputAttributes.map(_.withTableAlias(qname.fullName)),
plan.nodeLocation
)
case None =>
Expand Down Expand Up @@ -260,14 +256,14 @@ object TypeResolver extends LogSupport {
val mergedJoinKeys = resolvedJoinKeys
.groupBy(_.attributeName).map { case (name, keys) =>
val resolvedKeys = keys.flatMap {
case SingleColumn(r: ResolvedAttribute, qual, _) =>
case SingleColumn(r: ResolvedAttribute, qual, _, _) =>
Seq(r.withQualifier(qual))
case m: MultiSourceColumn =>
m.inputs
case other =>
Seq(other)
}
MultiSourceColumn(resolvedKeys, None, None)
MultiSourceColumn(resolvedKeys, None, None, None)
}
.toSeq
// Preserve the original USING(k1, k2, ...) order
Expand Down Expand Up @@ -348,14 +344,14 @@ object TypeResolver extends LogSupport {
): Seq[Attribute] = {
val resolvedColumns = Seq.newBuilder[Attribute]
outputColumns.map {
case a @ Alias(qualifier, name, expr, _) =>
case a @ Alias(qualifier, name, expr, _, _) =>
val resolved = resolveExpression(context, expr, inputAttributes)
if (expr eq resolved) {
resolvedColumns += a
} else {
resolvedColumns += a.copy(expr = resolved)
}
case s @ SingleColumn(expr, qualifier, nodeLocation) =>
case s @ SingleColumn(expr, qualifier, _, nodeLocation) =>
resolveExpression(context, expr, inputAttributes) match {
case a: Attribute =>
resolvedColumns += a.withQualifier(qualifier)
Expand All @@ -372,16 +368,15 @@ object TypeResolver extends LogSupport {

def resolveAttribute(attribute: Attribute): Attribute = {
attribute match {
case a @ Alias(qualifier, name, attr: Attribute, _) =>
case a @ Alias(qualifier, name, attr: Attribute, _, _) =>
val resolved = resolveAttribute(attr)
if (attr eq resolved) {
a
} else {
a.copy(expr = resolved)
}
case SingleColumn(a: Attribute, qualifier, _) if a.resolved =>
// Optimizes the nested attributes, but preserves qualifier in the parent
a.setQualifierIfEmpty(qualifier)
case SingleColumn(a: Attribute, qualifier, _, _) if a.resolved =>
a
case m: MultiSourceColumn =>
var changed = false
val resolvedInputs = m.inputs.map {
Expand All @@ -403,28 +398,26 @@ object TypeResolver extends LogSupport {
}

private def toResolvedAttribute(name: String, expr: Expression): Attribute = {

@tailrec
def findSourceColumn(e: Expression): Option[SourceColumn] = {
e match {
case r: ResolvedAttribute =>
r.sourceColumn
case a: Alias =>
findSourceColumn(a.expr)
case _ => None
case r: ResolvedAttribute => r.sourceColumn
case a: Alias => findSourceColumn(a.expr)
case _ => None
}
}

expr match {
case a: Alias =>
ResolvedAttribute(a.name, a.expr.dataType, a.qualifier, findSourceColumn(a.expr), a.nodeLocation)
ResolvedAttribute(a.name, a.expr.dataType, a.qualifier, findSourceColumn(a.expr), None, a.nodeLocation)
case s: SingleColumn =>
ResolvedAttribute(name, s.dataType, s.qualifier, findSourceColumn(s.expr), s.nodeLocation)
ResolvedAttribute(name, s.dataType, s.qualifier, findSourceColumn(s.expr), None, s.nodeLocation)
case a: Attribute =>
// No need to resolve Attribute expressions
a
a.withTableAlias(None)
case other =>
// Resolve expr as ResolvedAttribute so as not to pull-up too much details
ResolvedAttribute(name, other.dataType, None, findSourceColumn(expr), other.nodeLocation)
ResolvedAttribute(name, other.dataType, None, findSourceColumn(expr), None, other.nodeLocation)
}
}

Expand Down Expand Up @@ -459,20 +452,18 @@ object TypeResolver extends LogSupport {
val results = expr match {
case i: Identifier =>
lookup(i.value, context).map(toResolvedAttribute(i.value, _))
case u @ UnresolvedAttribute(qualifier, name, _) =>
case u @ UnresolvedAttribute(qualifier, name, _, _) =>
lookup(u.fullName, context).map(toResolvedAttribute(name, _).withQualifier(qualifier))
case a @ AllColumns(qualifier, None, _) =>
case a @ AllColumns(qualifier, None, _, _) =>
// Resolve the inputs of AllColumn as ResolvedAttribute
// so as not to pull up too much details
val allColumns = resolvedAttributes.map {
case a: Attribute =>
// Attribute can be used as is
a
case other =>
toResolvedAttribute(other.name, other)
// Attribute can be used as is
case a: Attribute => a
case other => toResolvedAttribute(other.name, other)
}
List(a.copy(columns = Some((qualifier match {
case Some(q) => allColumns.filter(_.qualifier.contains(q))
case Some(q) => allColumns.filter(c => c.qualifier.contains(q) || c.tableAlias.contains(q))
Copy link
Member

Choose a reason for hiding this comment

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

Ok. This is the important change in this PR :)

Copy link
Member Author

@takezoe takezoe Jul 13, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Rather, c.qualifier.contains(q) seems no longer necessary here. Will raise another PR.

Copy link
Member Author

Choose a reason for hiding this comment

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

#3061

case None => allColumns
}).map(_.withQualifier(None)))))
case _ =>
Expand Down
Loading