fixed merged + space instead of comma for multiple hints syntax

apache · May 26, 2017 · 6e40301 · 6e40301
1 parent d386cdf
commit 6e40301
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/sql/catalyst/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBase.g4 b/sql/catalyst/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBase.g4
@@ -381,7 +381,7 @@ querySpecification
     ;
 
 hint
-    : '/*+' hintStatements+=hintStatement (',' hintStatements+=hintStatement)* '*/'
+    : '/*+' hintStatements+=hintStatement (hintStatements+=hintStatement)* '*/'
     ;
 
 hintStatement

diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/PlanParserSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/PlanParserSuite.scala
@@ -594,7 +594,7 @@ class PlanParserSuite extends PlanTest {
 
   test("SPARK-20854: multiple hints") {
     comparePlans(
-      parsePlan("SELECT /*+ HINT1(a, 1), hint2(b, 2) */ * from t"),
+      parsePlan("SELECT /*+ HINT1(a, 1) hint2(b, 2) */ * from t"),
       UnresolvedHint("hint2", Seq($"b", Literal(2)),
         UnresolvedHint("HINT1", Seq($"a", Literal(1)),
         table("t").select(star())

diff --git a/sql/core/src/main/scala/org/apache/spark/sql/Dataset.scala b/sql/core/src/main/scala/org/apache/spark/sql/Dataset.scala
@@ -1176,7 +1176,7 @@ class Dataset[T] private[sql](
    * @since 2.2.0
    */
   @scala.annotation.varargs
-  def hint(name: String, parameters: String*): Dataset[T] = withTypedPlan {
+  def hint(name: String, parameters: Any*): Dataset[T] = withTypedPlan {
     UnresolvedHint(name, parameters, planWithBarrier)
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -381,7 +381,7 @@ querySpecification @@
         ;
     hint
-        : '/*+' hintStatements+=hintStatement (',' hintStatements+=hintStatement)* '*/'
+        : '/*+' hintStatements+=hintStatement (hintStatements+=hintStatement)* '*/'
         ;
     hintStatement
@@ Expand Down @@