Revert "Move some rules into postHocResolutionRules"

This reverts commit 1340862.

Author: maropu

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala

@@ -112,13 +112,7 @@ class Analyzer(
    * in an individual batch. This batch is to run right after the normal resolution batch and
    * execute its rules in one pass.
    */
-  def postHocResolutionRules: Seq[Rule[LogicalPlan]] =
-    ResolveOrdinalInOrderByAndGroupBy ::
-    ResolveAggAliasInGroupBy ::
-    ResolveMissingReferences ::
-    ResolveSubquery ::
-    ResolveAggregateFunctions ::
-    Nil
+  val postHocResolutionRules: Seq[Rule[LogicalPlan]] = Nil
 
   lazy val batches: Seq[Batch] = Seq(
     Batch("Hints", fixedPoint,
@@ -141,6 +135,9 @@ class Analyzer(
       ResolveUpCast ::
       ResolveGroupingAnalytics ::
       ResolvePivot ::
+      ResolveOrdinalInOrderByAndGroupBy ::
+      ResolveAggAliasInGroupBy ::
+      ResolveMissingReferences ::
       ExtractGenerator ::
       ResolveGenerate ::
       ResolveFunctions ::
@@ -151,12 +148,13 @@ class Analyzer(
       ResolveNaturalAndUsingJoin ::
       ExtractWindowExpressions ::
       GlobalAggregates ::
+      ResolveAggregateFunctions ::
       TimeWindowing ::
       ResolveInlineTables(conf) ::
       ResolveTimeZone(conf) ::
       TypeCoercion.typeCoercionRules ++
       extendedResolutionRules : _*),
-    Batch("Post-Hoc Resolution", fixedPoint, postHocResolutionRules: _*),
+    Batch("Post-Hoc Resolution", Once, postHocResolutionRules: _*),
     Batch("View", Once,
       AliasViewChild(conf)),
     Batch("Nondeterministic", Once,

sql/core/src/main/scala/org/apache/spark/sql/internal/BaseSessionStateBuilder.scala

@@ -161,11 +161,10 @@ abstract class BaseSessionStateBuilder(
         customResolutionRules
 
     override val postHocResolutionRules: Seq[Rule[LogicalPlan]] =
-      super.postHocResolutionRules ++ (
-        PreprocessTableCreation(session) +:
-          PreprocessTableInsertion(conf) +:
-          DataSourceAnalysis(conf) +:
-          customPostHocResolutionRules)
+      PreprocessTableCreation(session) +:
+        PreprocessTableInsertion(conf) +:
+        DataSourceAnalysis(conf) +:
+        customPostHocResolutionRules
 
     override val extendedCheckRules: Seq[LogicalPlan => Unit] =
       PreWriteCheck +:

sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveSessionStateBuilder.scala

@@ -74,14 +74,13 @@ class HiveSessionStateBuilder(session: SparkSession, parentState: Option[Session
       customResolutionRules
 
     override val postHocResolutionRules: Seq[Rule[LogicalPlan]] =
-      super.postHocResolutionRules ++ (
-        new DetermineTableStats(session) +:
-          RelationConversions(conf, catalog) +:
-          PreprocessTableCreation(session) +:
-          PreprocessTableInsertion(conf) +:
-          DataSourceAnalysis(conf) +:
-          HiveAnalysis +:
-          customPostHocResolutionRules)
+      new DetermineTableStats(session) +:
+      RelationConversions(conf, catalog) +:
+      PreprocessTableCreation(session) +:
+      PreprocessTableInsertion(conf) +:
+      DataSourceAnalysis(conf) +:
+      HiveAnalysis +:
+      customPostHocResolutionRules
 
     override val extendedCheckRules: Seq[LogicalPlan => Unit] =
       PreWriteCheck +: