Prevent stack over flow in unknown hint resolution

HyukjinKwon · HyukjinKwon · commit 7bae25b49ccd · 2019-11-23T03:13:53.000+09:00
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveHints.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveHints.scala
@@ -223,7 +223,7 @@ object ResolveHints {
             createRepartition(shuffle = false, hint)
           case "REPARTITION_BY_RANGE" =>
             createRepartitionByRange(hint)
-          case _ => plan
+          case _ => hint
         }
     }
   }
diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/ResolveHintsSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/ResolveHintsSuite.scala
@@ -245,4 +245,17 @@ class ResolveHintsSuite extends AnalysisTest {
       e => e.getLevel == Level.WARN &&
         e.getRenderedMessage.contains("Unrecognized hint: unknown_hint")))
   }
+
+  test("SPARK-30003: Prevent stack over flow in unknown hint resolution") {
+    val logAppender = new MockAppender()
+    withLogAppender(logAppender) {
+      checkAnalysis(
+        Project(testRelation.output, UnresolvedHint("unknown_hint", Seq("TaBlE"), table("TaBlE"))),
+        Project(testRelation.output, testRelation),
+        caseSensitive = false)
+    }
+    assert(logAppender.loggingEvents.exists(
+      e => e.getLevel == Level.WARN &&
+        e.getRenderedMessage.contains("Unrecognized hint: unknown_hint")))
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ object ResolveHints {`
`223`	`223`	`createRepartition(shuffle = false, hint)`
`224`	`224`	`case "REPARTITION_BY_RANGE" =>`
`225`	`225`	`createRepartitionByRange(hint)`
`226`		`- case _ => plan`
	`226`	`+ case _ => hint`
`227`	`227`	`}`
`228`	`228`	`}`
`229`	`229`	`}`