[spark] branch branch-3.1 updated: Revert "[SPARK-35665][SQL] Resolve UnresolvedAlias in CollectMetrics"

[gurwls223]

This is an automated email from the ASF dual-hosted git repository.

gurwls223 pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/spark.git


The following commit(s) were added to refs/heads/branch-3.1 by this push:
     new 9288649  Revert "[SPARK-35665][SQL] Resolve UnresolvedAlias in 
CollectMetrics"
9288649 is described below

commit 9288649616c335e096b7258ec80196eeb2be1d03
Author: Hyukjin Kwon <gurwls...@apache.org>
AuthorDate: Mon Jun 7 21:08:05 2021 +0900

    Revert "[SPARK-35665][SQL] Resolve UnresolvedAlias in CollectMetrics"
    
    This reverts commit aa221991b3f0f1b7c91e87337f9eb5d164167f5a.
---
 .../main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala   | 3 ---
 .../test/scala/org/apache/spark/sql/util/DataFrameCallbackSuite.scala  | 3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git 
a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
 
b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
index 899e723..600a5af 100644
--- 
a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
+++ 
b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
@@ -420,9 +420,6 @@ class Analyzer(override val catalogManager: CatalogManager)
 
       case Project(projectList, child) if child.resolved && 
hasUnresolvedAlias(projectList) =>
         Project(assignAliases(projectList), child)
-
-      case c: CollectMetrics if c.child.resolved && 
hasUnresolvedAlias(c.metrics) =>
-        c.copy(metrics = assignAliases(c.metrics))
     }
   }
 
diff --git 
a/sql/core/src/test/scala/org/apache/spark/sql/util/DataFrameCallbackSuite.scala
 
b/sql/core/src/test/scala/org/apache/spark/sql/util/DataFrameCallbackSuite.scala
index e3fcf8b..b17c935 100644
--- 
a/sql/core/src/test/scala/org/apache/spark/sql/util/DataFrameCallbackSuite.scala
+++ 
b/sql/core/src/test/scala/org/apache/spark/sql/util/DataFrameCallbackSuite.scala
@@ -251,8 +251,7 @@ class DataFrameCallbackSuite extends QueryTest
           name = "my_event",
           min($"id").as("min_val"),
           max($"id").as("max_val"),
-          // Test unresolved alias
-          sum($"id"),
+          sum($"id").as("sum_val"),
           count(when($"id" % 2 === 0, 1)).as("num_even"))
         .observe(
           name = "other_event",

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org