carbondata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chenliang...@apache.org
Subject [1/2] incubator-carbondata git commit: remove no-used Keyword in CarbonSqlParser
Date Wed, 06 Jul 2016 06:41:34 GMT
Repository: incubator-carbondata
Updated Branches:
  refs/heads/master e86568568 -> 39d45f778


remove no-used Keyword in CarbonSqlParser


Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/a5fb8dc8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/a5fb8dc8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/a5fb8dc8

Branch: refs/heads/master
Commit: a5fb8dc80197c1d08edc61177f962f4543b7b9ce
Parents: e865685
Author: Jay357089 <liujunjie9@uawei.com>
Authored: Mon Jul 4 20:50:17 2016 +0800
Committer: chenliang613 <chenliang613@apache.org>
Committed: Wed Jul 6 12:10:18 2016 +0530

----------------------------------------------------------------------
 .../org/apache/spark/sql/CarbonSqlParser.scala  | 46 --------------------
 1 file changed, 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/a5fb8dc8/integration/spark/src/main/scala/org/apache/spark/sql/CarbonSqlParser.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/CarbonSqlParser.scala b/integration/spark/src/main/scala/org/apache/spark/sql/CarbonSqlParser.scala
index 6164f54..b0870d3 100644
--- a/integration/spark/src/main/scala/org/apache/spark/sql/CarbonSqlParser.scala
+++ b/integration/spark/src/main/scala/org/apache/spark/sql/CarbonSqlParser.scala
@@ -47,73 +47,42 @@ import org.carbondata.spark.util.CommonUtil
 class CarbonSqlParser()
   extends AbstractSparkSQLParser with Logging {
 
-  protected val AGGREGATE = Keyword("AGGREGATE")
   protected val AS = Keyword("AS")
   protected val AGGREGATION = Keyword("AGGREGATION")
   protected val ALL = Keyword("ALL")
   protected val HIGH_CARDINALITY_DIMS = Keyword("NO_DICTIONARY")
   protected val BEFORE = Keyword("BEFORE")
-  protected val BY = Keyword("BY")
   protected val CARDINALITY = Keyword("CARDINALITY")
   protected val CLASS = Keyword("CLASS")
   protected val CLEAN = Keyword("CLEAN")
-  protected val COLS = Keyword("COLS")
   protected val COLUMNS = Keyword("COLUMNS")
-  protected val CREATE = Keyword("CREATE")
-  protected val CUBE = Keyword("CUBE")
   protected val CUBES = Keyword("CUBES")
   protected val DATA = Keyword("DATA")
-  protected val DATABASES = Keyword("DATABASES")
   protected val DELETE = Keyword("DELETE")
-  protected val DELIMITER = Keyword("DELIMITER")
   protected val DESCRIBE = Keyword("DESCRIBE")
   protected val DESC = Keyword("DESC")
   protected val DETAIL = Keyword("DETAIL")
-  protected val DIMENSIONS = Keyword("DIMENSIONS")
-  protected val DIMFOLDERPATH = Keyword("DIMFOLDERPATH")
   protected val DROP = Keyword("DROP")
-  protected val ESCAPECHAR = Keyword("ESCAPECHAR")
-  protected val EXCLUDE = Keyword("EXCLUDE")
   protected val EXTENDED = Keyword("EXTENDED")
   protected val FORMATTED = Keyword("FORMATTED")
-  protected val FACT = Keyword("FACT")
-  protected val FIELDS = Keyword("FIELDS")
-  protected val FILEHEADER = Keyword("FILEHEADER")
   protected val FILES = Keyword("FILES")
   protected val FROM = Keyword("FROM")
   protected val HIERARCHIES = Keyword("HIERARCHIES")
   protected val IN = Keyword("IN")
-  protected val INCLUDE = Keyword("INCLUDE")
   protected val INPATH = Keyword("INPATH")
   protected val INTO = Keyword("INTO")
   protected val LEVELS = Keyword("LEVELS")
-  protected val LIKE = Keyword("LIKE")
   protected val LOAD = Keyword("LOAD")
   protected val LOADS = Keyword("LOADS")
   protected val LOCAL = Keyword("LOCAL")
-  protected val MAPPED = Keyword("MAPPED")
-  protected val MEASURES = Keyword("MEASURES")
-  protected val MULTILINE = Keyword("MULTILINE")
-  protected val COMPLEX_DELIMITER_LEVEL_1 = Keyword("COMPLEX_DELIMITER_LEVEL_1")
-  protected val COMPLEX_DELIMITER_LEVEL_2 = Keyword("COMPLEX_DELIMITER_LEVEL_2")
   protected val OPTIONS = Keyword("OPTIONS")
-  protected val OUTPATH = Keyword("OUTPATH")
   protected val OVERWRITE = Keyword("OVERWRITE")
   protected val PARTITION_COUNT = Keyword("PARTITION_COUNT")
-  protected val PARTITIONDATA = Keyword("PARTITIONDATA")
   protected val PARTITIONER = Keyword("PARTITIONER")
-  protected val QUOTECHAR = Keyword("QUOTECHAR")
-  protected val RELATION = Keyword("RELATION")
-  protected val SCHEMAS = Keyword("SCHEMAS")
   protected val SHOW = Keyword("SHOW")
-  protected val TABLES = Keyword("TABLES")
   protected val TABLE = Keyword("TABLE")
-  protected val TERMINATED = Keyword("TERMINATED")
   protected val TYPE = Keyword("TYPE")
-  protected val USE = Keyword("USE")
   protected val WHERE = Keyword("WHERE")
-  protected val WITH = Keyword("WITH")
-  protected val AGGREGATETABLE = Keyword("AGGREGATETABLE")
   protected val SUM = Keyword("sum")
   protected val COUNT = Keyword("count")
   protected val AVG = Keyword("avg")
@@ -125,17 +94,10 @@ class CarbonSqlParser()
   protected val ABS = Keyword("abs")
 
   protected val FOR = Keyword("FOR")
-  protected val SCRIPTS = Keyword("SCRIPTS")
-  protected val USING = Keyword("USING")
   protected val LIMIT = Keyword("LIMIT")
   protected val DEFAULTS = Keyword("DEFAULTS")
   protected val ALTER = Keyword("ALTER")
-  protected val ADD = Keyword("ADD")
 
-  protected val IF = Keyword("IF")
-  protected val NOT = Keyword("NOT")
-  protected val EXISTS = Keyword("EXISTS")
-  protected val DIMENSION = Keyword("DIMENSION")
   protected val STARTTIME = Keyword("STARTTIME")
   protected val SEGMENTS = Keyword("SEGMENTS")
   protected val SEGMENT = Keyword("SEGMENT")
@@ -991,14 +953,6 @@ class CarbonSqlParser()
       case tableName ~ dataPath => DataLoadTableFileMapping(tableName, dataPath)
     }
 
-  protected lazy val partitionOptions: Parser[(String, String)] =
-    ((DELIMITER ~ stringLit) | (QUOTECHAR ~ stringLit) | (FILEHEADER ~ stringLit) |
-      (ESCAPECHAR ~ stringLit) | (MULTILINE ~ stringLit) |
-      (COMPLEX_DELIMITER_LEVEL_1 ~ stringLit) | (COMPLEX_DELIMITER_LEVEL_2 ~ stringLit))
^^ {
-      case opt ~ optvalue => (opt, optvalue)
-      case _ => ("", "")
-    }
-
   protected lazy val loadOptions: Parser[(String, String)] =
     (stringLit <~ "=") ~ stringLit ^^ {
       case opt ~ optvalue => (opt.trim.toLowerCase(), optvalue)


Mime
View raw message