Skip to content

[SPARK-35331][SQL] Support resolving missing attrs for distribute/cluster by/repartition hint #32465

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

[SPARK-35331][SQL] Support resolving missing attrs for distribute/cluster by/repartition hint #32465

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c711e3
[SPARK-35331][SQL] Attributes become unknown in RepartitionByExpressi…
yaooqinn May 7, 2021
03ed3a5
[SPARK-35331][SQL] Attributes become unknown in RepartitionByExpressi…
yaooqinn May 7, 2021
2ce0fb6
add tests
yaooqinn May 8, 2021
5163262
empty
yaooqinn May 8, 2021
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
Next Next commit
[SPARK-35331][SQL] Attributes become unknown in RepartitionByExpressi… 
…on after aliased
  • Loading branch information
@yaooqinn
yaooqinn committed May 7, 2021
commit 0c711e3a081dc644c3a2d3c47207046eb4457ee1
9 changes: 9 additions & 0 deletions 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 @@ -1885,6 +1885,15 @@ class Analyzer(override val catalogManager: CatalogManager)
val newFilter = Filter(newCond.head, newChild)
Project(child.output, newFilter)
}

case r @ RepartitionByExpression(partitionExprs, child, _)
if (!r.resolved || r.missingInput.nonEmpty) && child.resolved =>
val (newPartitionExprs, newChild) = resolveExprsAndAddMissingAttrs(partitionExprs, child)
if (child.output == newChild.output) {
r.copy(newPartitionExprs, newChild)
} else {
Project(child.output, r.copy(newPartitionExprs, newChild))
}
}

/**
Expand Down
11 changes: 11 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4100,6 +4100,17 @@ class SQLQuerySuite extends QueryTest with SharedSparkSession with AdaptiveSpark
}
}
}

test("abcdedg") {
Seq("CLUSTER", "DISTRIBUTE").foreach { keyword =>
Seq("a", "substr(a, 0, 3)").foreach { expr =>
val clause = keyword + " by " + expr
withClue(clause) {
checkAnswer(sql(s"select a b from values('123') t(a) $clause"), Row("123"))
}
}
}
}
}

case class Foo(bar: Option[String])