cloud-fan commented on code in PR #37525:
URL: https://github.com/apache/spark/pull/37525#discussion_r1080777673
##########
sql/core/src/test/scala/org/apache/spark/sql/execution/PlannerSuite.scala:
##########
@@ -1314,6 +1313,135 @@ class PlannerSuite extends SharedSparkSession with
AdaptiveSparkPlanHelper {
assert(topKs.size == 1)
assert(sorts.isEmpty)
}
+
+ test("SPARK-40086: an attribute and its aliased version in aggregate
expressions should not " +
+ "introduce extra shuffle") {
+ withTempView("df") {
+ spark.range(5).select(col("id"),
col("id").as("value")).createTempView("df")
+ val df = sql("SELECT id, max(value) FROM df GROUP BY id")
+
+ val planned = df.queryExecution.executedPlan
+
+ assert(collect(planned) { case h: HashAggregateExec => h }.nonEmpty)
+
+ val exchanges = collect(planned) { case s: ShuffleExchangeExec => s }
+ assert(exchanges.size == 0)
+ }
+ }
+
+ test("SPARK-40086: multiple aliases to the same attribute in aggregate
expressions should not " +
+ "introduce extra shuffle") {
+ withTempView("df") {
+ spark.range(5).select(col("id").as("key"),
col("id").as("value")).createTempView("df")
+ val df = sql("SELECT key, max(value) FROM df GROUP BY key")
+
+ val planned = df.queryExecution.executedPlan
+
+ assert(collect(planned) { case h: HashAggregateExec => h }.nonEmpty)
+
+ val exchanges = collect(planned) { case s: ShuffleExchangeExec => s }
+ assert(exchanges.size == 0)
+ }
+ }
+
+ test("SPARK-40086: multiple aliases to the same attribute with complex
required distribution " +
+ "should not introduce extra shuffle") {
+ withSQLConf(SQLConf.AUTO_BROADCASTJOIN_THRESHOLD.key -> "-1") {
+ val df = spark.range(5)
+ val df1 = df.repartition($"id" + $"id")
+ .select($"id".as("key1"), $"id".as("value1"), ($"id" +
$"id").as("idPlusId1"))
+ val df2 = df.repartition($"id" + $"id")
+ .select($"id".as("key2"), $"id".as("value2"), ($"id" +
$"id").as("idPlusId2"))
+ val df3 = df1.join(df2, $"key1" + $"value1" === $"idPlusId2")
+
+ val planned = df3.queryExecution.executedPlan
+
+ val numShuffles = collect(planned) {
+ case e: ShuffleExchangeExec => e
+ }
+ // before: numShuffles is 4
Review Comment:
let's put the JIRA ticket id. otherwise people don't know what `before` means
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
