Skip to content

Commit db136d3

Browse files
ssimeonovhvanhovell
authored andcommitted
[SPARK-26084][SQL] Fixes unresolved AggregateExpression.references exception
## What changes were proposed in this pull request? This PR fixes an exception in `AggregateExpression.references` called on unresolved expressions. It implements the solution proposed in [SPARK-26084](https://issues.apache.org/jira/browse/SPARK-26084), a minor refactoring that removes the unnecessary dependence on `AttributeSet.toSeq`, which requires expression IDs and, therefore, can only execute successfully for resolved expressions. The refactored implementation is both simpler and faster, eliminating the conversion of a `Set` to a `Seq` and back to `Set`. ## How was this patch tested? Added a new test based on the failing case in [SPARK-26084](https://issues.apache.org/jira/browse/SPARK-26084). hvanhovell Closes apache#23075 from ssimeonov/ss_SPARK-26084. Authored-by: Simeon Simeonov <sim@fastignite.com> Signed-off-by: Herman van Hovell <hvanhovell@databricks.com>
1 parent ab61ddb commit db136d3

File tree

2 files changed

+37
-5
lines changed

2 files changed

+37
-5
lines changed

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregate/interfaces.scala

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,10 @@ case class AggregateExpression(
128128
override def nullable: Boolean = aggregateFunction.nullable
129129

130130
override def references: AttributeSet = {
131-
val childReferences = mode match {
132-
case Partial | Complete => aggregateFunction.references.toSeq
133-
case PartialMerge | Final => aggregateFunction.aggBufferAttributes
131+
mode match {
132+
case Partial | Complete => aggregateFunction.references
133+
case PartialMerge | Final => AttributeSet(aggregateFunction.aggBufferAttributes)
134134
}
135-
136-
AttributeSet(childReferences)
137135
}
138136

139137
override def toString: String = {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
package org.apache.spark.sql.catalyst.expressions.aggregate
19+
20+
import org.apache.spark.SparkFunSuite
21+
import org.apache.spark.sql.catalyst.analysis.UnresolvedAttribute
22+
import org.apache.spark.sql.catalyst.expressions.{Add, AttributeSet}
23+
24+
class AggregateExpressionSuite extends SparkFunSuite {
25+
26+
test("test references from unresolved aggregate functions") {
27+
val x = UnresolvedAttribute("x")
28+
val y = UnresolvedAttribute("y")
29+
val actual = AggregateExpression(Sum(Add(x, y)), mode = Complete, isDistinct = false).references
30+
val expected = AttributeSet(x :: y :: Nil)
31+
assert(expected == actual, s"Expected: $expected. Actual: $actual")
32+
}
33+
34+
}

0 commit comments

Comments
 (0)