Updated as per the comments by Admin

Author: ravipesala

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

@@ -182,18 +182,12 @@ class SqlParser extends StandardTokenParsers with PackratParsers {
         val overwrite: Boolean = o.getOrElse("") == "OVERWRITE"
         InsertIntoTable(r, Map[String, Option[String]](), s, overwrite)
     }
-    
-  protected lazy val addCache: Parser[LogicalPlan] =
-    ADD ~ CACHE ~ TABLE ~> ident ~ AS ~ select <~ opt(";") ^^ {
-     case tableName ~ as ~ s =>
-       CacheTableAsSelectCommand(tableName,s)
-    }        
 
   protected lazy val cache: Parser[LogicalPlan] =
-    CACHE ~ TABLE ~> ident ~ opt(AS) ~ opt(select) <~ opt(";") ^^ {
-      case tableName ~ None ~ None => 
+    CACHE ~ TABLE ~> ident ~ opt(AS ~ select) <~ opt(";") ^^ {
+      case tableName ~ None => 
         CacheCommand(tableName, true)
-      case tableName ~ as ~ Some(plan) => 
+      case tableName ~ Some(as ~ plan) =>
         CacheTableAsSelectCommand(tableName,plan)
     }
 

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

@@ -77,6 +77,6 @@ case class DescribeCommand(
 }
 
 /**
- * Returned for the "ADD CACHE TABLE tableName AS SELECT .." command.
+ * Returned for the "CACHE TABLE tableName AS SELECT .." command.
  */
 case class CacheTableAsSelectCommand(tableName: String, plan: LogicalPlan) extends Command

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

@@ -305,7 +305,7 @@ private[sql] abstract class SparkStrategies extends QueryPlanner[SparkPlan] {
         Seq(execution.ExplainCommand(logicalPlan, plan.output, extended)(context))
       case logical.CacheCommand(tableName, cache) =>
         Seq(execution.CacheCommand(tableName, cache)(context))
-      case logical.CacheTableAsSelectCommand(tableName,plan) =>
+      case logical.CacheTableAsSelectCommand(tableName, plan) =>
         Seq(execution.CacheTableAsSelectCommand(tableName, plan))
       case _ => Nil
     }