Avoid reinitialization of lexical in parse method

maropu · Jun 26, 2015 · e27c66c · e27c66c
1 parent ef4f60f
commit e27c66c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/AbstractSparkSQLParser.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/AbstractSparkSQLParser.scala
@@ -30,12 +30,14 @@ private[sql] abstract class AbstractSparkSQLParser
 
   def parse(input: String): LogicalPlan = {
     // Initialize the Keywords.
-    lexical.initialize(reservedWords)
+    initLexical
     phrase(start)(new lexical.Scanner(input)) match {
       case Success(plan, _) => plan
       case failureOrError => sys.error(failureOrError.toString)
     }
   }
+  /* One time initialization of lexical.This avoid reinitialization of  lexical in parse method */
+  protected lazy val initLexical: Unit = lexical.initialize(reservedWords)
 
   protected case class Keyword(str: String) {
     def normalize: String = lexical.normalizeKeyword(str)
@@ -82,10 +84,8 @@ class SqlLexical extends StdLexical {
 
   /* This is a work around to support the lazy setting */
   def initialize(keywords: Seq[String]): Unit = {
-    synchronized {
       reserved.clear()
       reserved ++= keywords
-    }
   }
 
   /* Normal the keyword string */