Github user chenghao-intel commented on a diff in the pull request:
https://github.com/apache/spark/pull/3926#discussion_r22575865
--- Diff:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SparkSQLParser.scala
---
@@ -25,15 +25,47 @@ import scala.util.parsing.input.CharArrayReader.EofCh
import org.apache.spark.sql.catalyst.plans.logical._
-private[sql] abstract class AbstractSparkSQLParser
+private[sql] trait KeywordNormalizer {
+ def apply(str: String): String = str
+}
+
+private[sql] object CaseInsensitive extends KeywordNormalizer {
+ override def apply(str: String) = str.toLowerCase()
+}
+
+// TODO make the normalizer configurable?
+private[sql] abstract class AbstractSparkSQLParser(normalizer:
KeywordNormalizer = CaseInsensitive)
extends StandardTokenParsers with PackratParsers {
- def apply(input: String): LogicalPlan = phrase(start)(new
lexical.Scanner(input)) match {
- case Success(plan, _) => plan
- case failureOrError => sys.error(failureOrError.toString)
+ def apply(input: String): LogicalPlan = {
+ // Initialize the Keywords.
+ lexical.initialize(reservedWords.map(_.normalize))
+ phrase(start)(new lexical.Scanner(input)) match {
+ case Success(plan, _) => plan
+ case failureOrError => sys.error(failureOrError.toString)
+ }
+ }
+
+ protected case class Keyword(str: String) {
+ def normalize = normalizer(str)
+ def parser: Parser[String] = normalize
}
- protected case class Keyword(str: String)
+ protected implicit def asParser(k: Keyword): Parser[String] = k.parser
+
+ // By default, use Reflection to find the reserved words defined in the
sub class.
+ // NOTICE, Since the Keyword properties defined by sub class, we
couldn't call this
+ // method during the parent class instantiation, because the sub class
instance
+ // isn't created yet. Using `def` instead of the `val` for the lazy
initialization.
+ protected def reservedWords: Seq[Keyword] =
--- End diff --
Yeah, you're right, will fix this.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
