vladimirg-db commented on code in PR #50606:
URL: https://github.com/apache/spark/pull/50606#discussion_r2048438196
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/dsl/package.scala:
##########
@@ -446,11 +447,16 @@ package object dsl {
def sortBy(sortExprs: SortOrder*): LogicalPlan = Sort(sortExprs, false,
logicalPlan)
def groupBy(groupingExprs: Expression*)(aggregateExprs: Expression*):
LogicalPlan = {
+ // Replace top-level integer literals with ordinals, if
`groupByOrdinal` is enabled.
+ val groupingExprsWithReplacedOrdinals = groupingExprs.map {
Review Comment:
The ordinals are not replaced. They are "injected"
```suggestion
val groupingExprsWithOrdinals = groupingExprs.map {
```
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala:
##########
@@ -1979,19 +1978,7 @@ class Analyzer(override val catalogManager:
CatalogManager) extends RuleExecutor
throw
QueryCompilationErrors.groupByPositionRefersToAggregateFunctionError(
index, ordinalExpr)
} else {
Review Comment:
You can drop this `else`, since there's a `throw` above.
##########
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/GroupByOrdinalsRepeatedAnalysisSuite.scala:
##########
@@ -17,63 +17,42 @@
package org.apache.spark.sql.catalyst.analysis
-import org.apache.spark.sql.catalyst.analysis.TestRelations.{testRelation,
testRelation2}
+import org.apache.spark.sql.catalyst.analysis.TestRelations.testRelation
import org.apache.spark.sql.catalyst.dsl.expressions._
import org.apache.spark.sql.catalyst.dsl.plans._
import org.apache.spark.sql.catalyst.expressions.{GenericInternalRow, Literal}
import org.apache.spark.sql.catalyst.plans.logical.LocalRelation
-import org.apache.spark.sql.internal.SQLConf
-class SubstituteUnresolvedOrdinalsSuite extends AnalysisTest {
- private lazy val a = testRelation2.output(0)
- private lazy val b = testRelation2.output(1)
+class GroupByOrdinalsRepeatedAnalysisSuite extends AnalysisTest {
test("unresolved ordinal should not be unresolved") {
// Expression OrderByOrdinal is unresolved.
assert(!UnresolvedOrdinal(0).resolved)
}
- test("order by ordinal") {
- // Tests order by ordinal, apply single rule.
- val plan = testRelation2.orderBy(Literal(1).asc, Literal(2).asc)
+ test("SPARK-45920: group by ordinal repeated analysis") {
+ val plan = testRelation.groupBy(Literal(1))(Literal(100).as("a")).analyze
comparePlans(
- SubstituteUnresolvedOrdinals.apply(plan),
- testRelation2.orderBy(UnresolvedOrdinal(1).asc,
UnresolvedOrdinal(2).asc))
-
- // Tests order by ordinal, do full analysis
- checkAnalysis(plan, testRelation2.orderBy(a.asc, b.asc))
+ plan,
+ testRelation.groupBy(Literal(1))(Literal(100).as("a")).analyze
+ )
- // order by ordinal can be turned off by config
- withSQLConf(SQLConf.ORDER_BY_ORDINAL.key -> "false") {
Review Comment:
Why do we remove this piece of test?
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/SubstituteUnresolvedOrdinals.scala:
##########
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.spark.sql.catalyst.analysis
-
-import org.apache.spark.sql.catalyst.expressions.{BaseGroupingSets,
Expression, Literal, SortOrder}
-import org.apache.spark.sql.catalyst.plans.logical.{Aggregate, LogicalPlan,
Sort}
-import org.apache.spark.sql.catalyst.rules.Rule
-import org.apache.spark.sql.catalyst.trees.CurrentOrigin.withOrigin
-import org.apache.spark.sql.catalyst.trees.TreePattern._
-import org.apache.spark.sql.types.IntegerType
-
-/**
- * Replaces ordinal in 'order by' or 'group by' with UnresolvedOrdinal
expression.
- */
-object SubstituteUnresolvedOrdinals extends Rule[LogicalPlan] {
Review Comment:
Nice!
##########
sql/core/src/test/scala/org/apache/spark/sql/analysis/resolver/AggregateResolverSuite.scala:
##########
@@ -44,12 +44,6 @@ class AggregateResolverSuite extends QueryTest with
SharedSparkSession {
resolverRunner.resolve(query)
}
- test("Valid group by ordinal") {
Review Comment:
We can simply comment out the tests.
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala:
##########
@@ -1825,24 +1825,25 @@ class AstBuilder extends DataTypeAstBuilder
}
visitNamedExpression(n)
}.toSeq
+ val groupByExpressionsWithReplacedOrdinals =
+ replaceOrdinalsInGroupingExpressions(groupByExpressions)
Review Comment:
I think the wording should be different here as well. We don't replace
ordinals, but we replace integers with ordinal nodes. So it's more like
"emplace unresolved ordinals".
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
