From 23982b196543bce1f8f0f6f24b44c1e90c14e92e Mon Sep 17 00:00:00 2001 From: Liang-Chi Hsieh Date: Wed, 15 Feb 2017 14:51:54 +0000 Subject: [PATCH] Disallow space as the delimiter. --- .../org/apache/spark/sql/catalyst/parser/SqlBase.g4 | 1 - .../spark/sql/catalyst/parser/PlanParserSuite.scala | 10 ++++++++-- 2 files changed, 8 insertions(+), 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 index 0ac986d1376f..d8cd68e2d9e9 100644 --- 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 @@ -380,7 +380,6 @@ hint hintStatement : hintName=identifier - | hintName=identifier '(' parameters+=identifier parameters+=identifier ')' | hintName=identifier '(' parameters+=identifier (',' parameters+=identifier)* ')' ; 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 index 13a84b465b6c..2c1425242620 100644 --- 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 @@ -505,7 +505,13 @@ class PlanParserSuite extends PlanTest { val m2 = intercept[ParseException] { parsePlan("SELECT /*+ MAPJOIN(default.t) */ * from default.t") }.getMessage - assert(m2.contains("no viable alternative at input")) + assert(m2.contains("mismatched input '.' expecting {')', ','}")) + + // Disallow space as the delimiter. + val m3 = intercept[ParseException] { + parsePlan("SELECT /*+ INDEX(a b c) */ * from default.t") + }.getMessage + assert(m3.contains("mismatched input 'b' expecting {')', ','}")) comparePlans( parsePlan("SELECT /*+ HINT */ * FROM t"), @@ -524,7 +530,7 @@ class PlanParserSuite extends PlanTest { Hint("STREAMTABLE", Seq("a", "b", "c"), table("t").select(star()))) comparePlans( - parsePlan("SELECT /*+ INDEX(t emp_job_ix) */ * FROM t"), + parsePlan("SELECT /*+ INDEX(t, emp_job_ix) */ * FROM t"), Hint("INDEX", Seq("t", "emp_job_ix"), table("t").select(star()))) comparePlans(