follow comment

apache · Apr 3, 2020 · 0d81b4d · 0d81b4d
1 parent 24e9d4d
commit 0d81b4d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 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
@@ -1067,7 +1067,7 @@ class Analyzer(
       }
     }
   }
-
+  
   /**
    * Replaces [[UnresolvedAttribute]]s with concrete [[AttributeReference]]s from
    * a logical plan node's children.
@@ -1394,14 +1394,6 @@ class Analyzer(
       case f @ Filter(cond, _) if containsAggregate(cond) => f
       case q: LogicalPlan =>
         logTrace(s"Attempting to resolve ${q.simpleString(SQLConf.get.maxToStringFields)}")
-        //        q.mapExpressions { e =>
-        //          q match {
-        //            case _: Filter if containsAggregate(e) =>
-        //              e
-        //            case _ =>
-        //              resolveExpressionTopDown(e, q)
-        //          }
-        //        }
         q.mapExpressions(resolveExpressionTopDown(_, q))
     }
 

diff --git a/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
@@ -3494,7 +3494,8 @@ class SQLQuerySuite extends QueryTest with SharedSparkSession with AdaptiveSpark
       Seq(Row(Map[Int, Int]()), Row(Map(1 -> 2))))
   }
 
-  test("SPARK-31334: TypeCoercion should before then ResolveAggregateFunctions") {
+  test("SPARK-31334: Don't ResolveReference/ResolveMissingReference when " +
+    "Filter condition with aggregate expression") {
     Seq(
       (1, 3),
       (2, 3),
@@ -3542,7 +3543,6 @@ class SQLQuerySuite extends QueryTest with SharedSparkSession with AdaptiveSpark
       assert(SQLConf.get.getConf(SQLConf.CODEGEN_FALLBACK) === true)
     }
   }
-
 }
 
 case class Foo(bar: Option[String])