Remove Parser for set commands. A few other fixes.

Author: concretevitamin

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala

@@ -41,10 +41,18 @@ import org.apache.spark.sql.catalyst.types._
  * for a SQL like language should checkout the HiveQL support in the sql/hive sub-project.
  */
 class SqlParser extends StandardTokenParsers with PackratParsers {
+
   def apply(input: String): LogicalPlan = {
-    phrase(query)(new lexical.Scanner(input)) match {
-      case Success(r, x) => r
-      case x => sys.error(x.toString)
+    // Special-case out set commands since the value fields can be
+    // complex to handle without RegexParsers.
+    if (input.toLowerCase.startsWith("set")) {
+      val kvPair = input.drop(3).split("=")
+      SetCommand(kvPair(0).trim, if (kvPair.size > 1) kvPair(1).trim else "")
+    } else {
+      phrase(query)(new lexical.Scanner(input)) match {
+        case Success(r, x) => r
+        case x => sys.error(x.toString)
+      }
     }
   }
 
@@ -170,22 +178,13 @@ class SqlParser extends StandardTokenParsers with PackratParsers {
   }
 
   protected lazy val query: Parser[LogicalPlan] = (
-      setCommand
-    | select * (
+    select * (
         UNION ~ ALL ^^^ { (q1: LogicalPlan, q2: LogicalPlan) => Union(q1, q2) } |
         UNION ~ opt(DISTINCT) ^^^ { (q1: LogicalPlan, q2: LogicalPlan) => Distinct(Union(q1, q2)) }
       )
     | insert
   )
 
-  protected lazy val setCommand: Parser[LogicalPlan] = {
-    // Comma needed for values such as "table1,table2".
-    val keyVal = ident | numericLit | stringLit
-    (SET ~> keyVal <~ "=") ~ rep1sep(keyVal, ",") <~ opt(";") ^^ {
-      case key ~ value => SetCommand(key, value.mkString(","))
-    }
-  }
-
   protected lazy val select: Parser[LogicalPlan] =
     SELECT ~> opt(DISTINCT) ~ projections ~
     opt(from) ~ opt(filter) ~

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/LogicalPlan.scala

@@ -113,9 +113,7 @@ case class NativeCommand(cmd: String) extends Command
 /**
  * Commands of the form "set key=value".
  */
-case class SetCommand(key: String, value: String) extends Command {
-  override def toString = s"<command> set $key=$value"
-}
+case class SetCommand(key: String, value: String) extends Command
 
 /**
  * Returned by a parser when the users only wants to see what query plan would be executed, without

sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala

@@ -282,7 +282,7 @@ class SQLContext(@transient val sparkContext: SparkContext)
       logical match {
         case SetCommand(key, value) =>
           sqlConf.set(key, value)
-          emptyResult
+          emptyResult // TODO: should this return something else?
         case _ => executedPlan.execute()
       }
     }

sql/core/src/main/scala/org/apache/spark/sql/execution/SparkStrategies.scala

@@ -29,7 +29,6 @@ private[sql] abstract class SparkStrategies extends QueryPlanner[SparkPlan] {
   self: SQLContext#SparkPlanner =>
 
   object HashJoin extends Strategy with PredicateHelper {
-
     def apply(plan: LogicalPlan): Seq[SparkPlan] = plan match {
       // Find inner joins where at least some predicates can be evaluated by matching hash keys
       // using the HashFilteredJoin pattern.

sql/core/src/test/scala/org/apache/spark/sql/SQLConfSuite.scala

@@ -49,7 +49,7 @@ class SQLConfSuite extends QueryTest {
     conf.clear()
   }
 
-  test("SQLConf picks up SQL set commands") {
+  test("parse SQL set commands") {
     sql(s"set $testKey=$testVal")
     assert(conf.get(testKey, testVal + "_") == testVal)
     assert(TestSQLContext.sqlConf.get(testKey, testVal + "_") == testVal)
@@ -59,12 +59,14 @@ class SQLConfSuite extends QueryTest {
     sql("set mapred.reduce.tasks = 40")
     assert(conf.get("mapred.reduce.tasks", "0") == "40")
 
-
     val key = "spark.sql.key"
     val vs = "val0,val_1,val2.3,my_table"
     sql(s"set $key=$vs")
     assert(conf.get(key, "0") == vs)
 
+    sql(s"set$key=")
+    assert(conf.get(key, "0") == "")
+
     conf.clear()
   }
 

sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala

@@ -209,7 +209,7 @@ private[hive] object HiveQl {
     try {
       if (sql.toLowerCase.startsWith("set")) {
         val kvPair = sql.drop(3).split("=")
-        SetCommand(kvPair(0).trim, kvPair(1).trim)
+        SetCommand(kvPair(0).trim, if (kvPair.size > 1) kvPair(1).trim else "")
       } else if (sql.toLowerCase.startsWith("add jar")) {
         AddJar(sql.drop(8))
       } else if (sql.toLowerCase.startsWith("add file")) {