Move some rules into postHocResolutionRules

Author: maropu

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

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

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

@@ -161,10 +161,11 @@ abstract class BaseSessionStateBuilder(
         customResolutionRules
 
     override val postHocResolutionRules: Seq[Rule[LogicalPlan]] =
-      PreprocessTableCreation(session) +:
-        PreprocessTableInsertion(conf) +:
-        DataSourceAnalysis(conf) +:
-        customPostHocResolutionRules
+      super.postHocResolutionRules ++ (
+        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,13 +74,14 @@ class HiveSessionStateBuilder(session: SparkSession, parentState: Option[Session
       customResolutionRules
 
     override val postHocResolutionRules: Seq[Rule[LogicalPlan]] =
-      new DetermineTableStats(session) +:
-      RelationConversions(conf, catalog) +:
-      PreprocessTableCreation(session) +:
-      PreprocessTableInsertion(conf) +:
-      DataSourceAnalysis(conf) +:
-      HiveAnalysis +:
-      customPostHocResolutionRules
+      super.postHocResolutionRules ++ (
+        new DetermineTableStats(session) +:
+          RelationConversions(conf, catalog) +:
+          PreprocessTableCreation(session) +:
+          PreprocessTableInsertion(conf) +:
+          DataSourceAnalysis(conf) +:
+          HiveAnalysis +:
+          customPostHocResolutionRules)
 
     override val extendedCheckRules: Seq[LogicalPlan => Unit] =
       PreWriteCheck +: