CR

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

@@ -92,7 +92,8 @@ object SubstituteHints {
   }
 
   /**
-   * Removes all the hints. This must be executed after all the other hint rules are executed.
+   * Removes all the hints, used to remove invalid hints provided by the user.
+   * This must be executed after all the other hint rules are executed.
    */
   object RemoveAllHints extends Rule[LogicalPlan] {
     def apply(plan: LogicalPlan): LogicalPlan = plan transformUp {

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala

@@ -383,7 +383,7 @@ class AstBuilder extends SqlBaseBaseVisitor[AnyRef] with Logging {
         val withWindow = withDistinct.optionalMap(windows)(withWindows)
 
         // Hint
-        withWindow.optionalMap(ctx.hint)(withHints)
+        withWindow.optionalMap(hint)(withHints)
     }
   }
 

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/SubstituteHintsSuite.scala

@@ -71,10 +71,8 @@ class SubstituteHintsSuite extends AnalysisTest {
   }
 
   test("should work for subqueries") {
-    val relation = UnresolvedRelation(TableIdentifier("table"), Some("tableAlias"))
-
     checkAnalysis(
-      Hint("MAPJOIN", Seq("tableAlias"), relation),
+      Hint("MAPJOIN", Seq("tableAlias"), table("table").as("tableAlias")),
       BroadcastHint(testRelation),
       caseSensitive = false)
 
@@ -85,7 +83,7 @@ class SubstituteHintsSuite extends AnalysisTest {
 
     // Negative case: if the alias doesn't match, don't match the original table name.
     checkAnalysis(
-      Hint("MAPJOIN", Seq("table"), relation),
+      Hint("MAPJOIN", Seq("table"), table("table").as("tableAlias")),
       testRelation,
       caseSensitive = false)
   }