From 493775ce9f2b890528e2b1fc5bf936adf09cb8c8 Mon Sep 17 00:00:00 2001
From: Cheng Hao <hao.cheng@intel.com>
Date: Sun, 26 Apr 2015 17:29:04 -0700
Subject: [PATCH] update the code as feedback

---
 .../main/scala/org/apache/spark/sql/catalyst/Dialect.scala | 2 ++
 .../src/main/scala/org/apache/spark/sql/SQLContext.scala   | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/Dialect.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/Dialect.scala
index 96d5771c46ff6..977003493d471 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/Dialect.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/Dialect.scala
@@ -17,6 +17,7 @@
 
 package org.apache.spark.sql.catalyst
 
+import org.apache.spark.annotation.DeveloperApi
 import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
 
 /**
@@ -25,6 +26,7 @@ import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
  * interface for advanced user.
  *
  */
+@DeveloperApi
 abstract class Dialect {
   // this is the main function that will be implemented by sql parser.
   def parse(sqlText: String): LogicalPlan
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala b/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala
index ddfc7a4e61174..d8cc92ad8f866 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala
@@ -77,8 +77,8 @@ import org.apache.spark.{Partition, SparkContext}
 private[spark] class DefaultDialect extends Dialect {
   @transient
   protected val sqlParser = {
-    val fallback = new catalyst.SqlParser
-    new SparkSQLParser(fallback.parse)
+    val catalystSqlParser = new catalyst.SqlParser
+    new SparkSQLParser(catalystSqlParser.parse)
   }
 
   override def parse(sqlText: String): LogicalPlan = {
@@ -189,7 +189,8 @@ class SQLContext(@transient val sparkContext: SparkContext)
         conf.unsetConf(SQLConf.DIALECT)
         // throw out the exception, and the default sql dialect will take effect for next query.
         throw new DialectException(
-          s"Unsupported SQL alias: $dialect, will set it as '${conf.dialect}'", e)
+          s"""Instantiating dialect '$dialect' failed.
+             |Reverting to default dialect '${conf.dialect}'""".stripMargin, e)
     }
   }