quickstep-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jianq...@apache.org
Subject [3/3] incubator-quickstep git commit: Minor bug fixes and refactors.
Date Wed, 09 May 2018 21:20:05 GMT
Minor bug fixes and refactors.


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

Branch: refs/heads/master
Commit: 42588d43326b4889fa5696c4103315f490e9808a
Parents: 06982e9
Author: Zuyu Zhang <zuyu@cs.wisc.edu>
Authored: Mon May 7 16:08:35 2018 -0500
Committer: Zuyu Zhang <zuyu@cs.wisc.edu>
Committed: Wed May 9 14:55:00 2018 -0500

----------------------------------------------------------------------
 parser/SqlLexer.lpp                             |    4 +-
 parser/SqlParser.ypp                            |    8 +-
 parser/preprocessed/SqlLexer_gen.cpp            |   34 +-
 parser/preprocessed/SqlParser_gen.cpp           | 1802 +++++++++---------
 parser/preprocessed/SqlParser_gen.hpp           |  176 +-
 .../cost_model/StarSchemaSimpleCostModel.cpp    |    3 +-
 query_optimizer/resolver/Resolver.cpp           |   37 +-
 query_optimizer/rules/InjectJoinFilters.cpp     |   47 +-
 query_optimizer/rules/ReorderColumns.cpp        |    4 +-
 .../BarrieredReadWriteConcurrentBitVector.hpp   |    2 +-
 utility/ExecutionDAGVisualizer.cpp              |   20 +-
 11 files changed, 1092 insertions(+), 1045 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/42588d43/parser/SqlLexer.lpp
----------------------------------------------------------------------
diff --git a/parser/SqlLexer.lpp b/parser/SqlLexer.lpp
index d818d0b..6f75424 100644
--- a/parser/SqlLexer.lpp
+++ b/parser/SqlLexer.lpp
@@ -183,9 +183,8 @@ unsigned_numeric_literal {exact_numeric_literal}|{approximate_numeric_literal}
   "blockproperties"  return TOKEN_BLOCKPROPERTIES;
   "blocksample"      return TOKEN_BLOCKSAMPLE;
   "bloomfilter"      return TOKEN_BLOOM_FILTER;
-  "case"             return TOKEN_CASE;
-  "csbtree"          return TOKEN_CSB_TREE;
   "by"               return TOKEN_BY;
+  "case"             return TOKEN_CASE;
   "char"             return TOKEN_CHARACTER;
   "character"        return TOKEN_CHARACTER;
   "check"            return TOKEN_CHECK;
@@ -193,6 +192,7 @@ unsigned_numeric_literal {exact_numeric_literal}|{approximate_numeric_literal}
   "constraint"       return TOKEN_CONSTRAINT;
   "copy"             return TOKEN_COPY;
   "create"           return TOKEN_CREATE;
+  "csbtree"          return TOKEN_CSB_TREE;
   "current"          return TOKEN_CURRENT;
   "date"             return TOKEN_DATE;
   "datetime"         return TOKEN_DATETIME;

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/42588d43/parser/SqlParser.ypp
----------------------------------------------------------------------
diff --git a/parser/SqlParser.ypp b/parser/SqlParser.ypp
index ba69b3d..12a6b29 100644
--- a/parser/SqlParser.ypp
+++ b/parser/SqlParser.ypp
@@ -259,7 +259,6 @@ void NotSupported(const YYLTYPE *location, yyscan_t yyscanner, const std::string
 %token TOKEN_BLOCKPROPERTIES;
 %token TOKEN_BLOCKSAMPLE;
 %token TOKEN_BLOOM_FILTER;
-%token TOKEN_CSB_TREE;
 %token TOKEN_BY;
 %token TOKEN_CASE;
 %token TOKEN_CHARACTER;
@@ -268,6 +267,7 @@ void NotSupported(const YYLTYPE *location, yyscan_t yyscanner, const std::string
 %token TOKEN_CONSTRAINT;
 %token TOKEN_COPY;
 %token TOKEN_CREATE;
+%token TOKEN_CSB_TREE;
 %token TOKEN_CURRENT;
 %token TOKEN_DATE;
 %token TOKEN_DATETIME;
@@ -281,6 +281,7 @@ void NotSupported(const YYLTYPE *location, yyscan_t yyscanner, const std::string
 %token TOKEN_DROP;
 %token TOKEN_ELSE;
 %token TOKEN_END;
+%token TOKEN_EOF;
 %token TOKEN_EXISTS;
 %token TOKEN_EXTRACT;
 %token TOKEN_FALSE;
@@ -307,6 +308,7 @@ void NotSupported(const YYLTYPE *location, yyscan_t yyscanner, const std::string
 %token TOKEN_KEY;
 %token TOKEN_LAST;
 %token TOKEN_LEFT;
+%token TOKEN_LEX_ERROR;
 %token TOKEN_LIMIT;
 %token TOKEN_LONG;
 %token TOKEN_MINUTE;
@@ -333,8 +335,8 @@ void NotSupported(const YYLTYPE *location, yyscan_t yyscanner, const std::string
 %token TOKEN_REGEXP;
 %token TOKEN_RIGHT;
 %token TOKEN_ROW;
-%token TOKEN_ROW_DELIMITER;
 %token TOKEN_ROWS;
+%token TOKEN_ROW_DELIMITER;
 %token TOKEN_SECOND;
 %token TOKEN_SELECT;
 %token TOKEN_SET;
@@ -363,8 +365,6 @@ void NotSupported(const YYLTYPE *location, yyscan_t yyscanner, const std::string
 %token TOKEN_WITH;
 %token TOKEN_YEAR;
 %token TOKEN_YEARMONTH;
-%token TOKEN_EOF;
-%token TOKEN_LEX_ERROR;
 
 %type <string_value_>
   any_name

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/42588d43/parser/preprocessed/SqlLexer_gen.cpp
----------------------------------------------------------------------
diff --git a/parser/preprocessed/SqlLexer_gen.cpp b/parser/preprocessed/SqlLexer_gen.cpp
index 4800cde..ff483a4 100644
--- a/parser/preprocessed/SqlLexer_gen.cpp
+++ b/parser/preprocessed/SqlLexer_gen.cpp
@@ -611,7 +611,7 @@ static const flex_int16_t yy_accept[589] =
       158,  158,  158,  158,  137,    4,    5,    5,    3,  155,
       155,  152,  156,  156,  150,  157,  157,  154,    1,  162,
       130,  160,  159,  159,  159,    0,  134,  131,  135,  158,
-      158,  158,  158,   10,  158,  158,  158,   22,  158,  158,
+      158,  158,  158,   10,  158,  158,  158,   20,  158,  158,
       158,  158,  158,  158,  158,  158,  158,  158,  158,  138,
 
       158,  158,  158,  158,  158,  158,  158,  158,  158,  158,
@@ -632,8 +632,8 @@ static const flex_int16_t yy_accept[589] =
       158,  158,  158,  158,  158,  158,  158,   98,  158,  158,
       103,  104,  158,  158,  158,  158,  158,  158,  158,  158,
       158,  158,  158,  158,  158,  158,  158,  158,  158,  141,
-      143,  142,  158,  158,  158,  158,  158,  158,  158,   20,
-       23,  158,  158,  158,   28,  158,  158,  158,   31,  158,
+      143,  142,  158,  158,  158,  158,  158,  158,  158,   21,
+       22,  158,  158,  158,   27,  158,  158,  158,   31,  158,
       158,  158,   37,  158,  158,   41,   42,  158,  158,  158,
 
       158,  158,  158,  158,   52,   53,  158,   55,  158,   57,
@@ -643,7 +643,7 @@ static const flex_int16_t yy_accept[589] =
       158,  158,  158,  158,  158,  158,  158,  110,  111,  114,
       158,  158,  158,  158,  158,  158,  158,  158,  123,  158,
       158,  126,  127,  141,  142,    8,  158,  158,  158,  158,
-      158,  158,  158,   25,  158,  158,  158,  158,  158,  158,
+      158,  158,  158,   24,  158,  158,  158,  158,  158,  158,
       158,  158,  158,  158,  158,  158,  158,  158,   46,   47,
        48,  158,  158,   54,  158,   59,   60,  158,  158,  158,
 
@@ -651,21 +651,21 @@ static const flex_int16_t yy_accept[589] =
       158,   93,  158,  158,   97,  158,  158,  158,  158,  158,
       158,  158,  109,  158,  158,  158,  117,  158,  158,  120,
       158,  158,  124,  158,  158,  158,  158,   14,  158,  158,
-      158,  158,  158,   26,  158,   29,  158,  158,  158,  158,
+      158,  158,  158,   25,  158,   28,  158,  158,  158,  158,
       158,   36,  158,  158,   40,   44,  158,  158,  158,   56,
        61,  158,  158,  158,   75,  158,  158,  158,  158,  158,
       158,   96,  158,  101,  102,  158,  106,  107,  158,  158,
       158,  158,  118,  119,  121,  158,  125,  158,  158,   13,
-      158,  158,  158,  158,  158,  158,   21,   30,  158,   34,
+      158,  158,  158,  158,  158,  158,   29,   30,  158,   34,
 
        35,  158,  158,   45,  158,   51,   63,  158,  158,  158,
        88,  158,   90,  158,  158,  158,  158,  158,  158,  158,
       158,  122,  158,  158,  158,  158,  158,  158,  158,  158,
        32,  158,   39,  158,  158,   65,  158,  158,   91,  158,
       158,  105,  158,  158,  158,  158,  158,   12,  158,  158,
-      158,  158,   24,  158,  158,   49,   64,   86,   89,  158,
+      158,  158,   23,  158,  158,   49,   64,   86,   89,  158,
       158,  108,  112,  158,  116,  128,   16,  158,  158,  158,
-       27,   38,   87,   95,  158,  158,  158,   18,   19,  158,
+       26,   38,   87,   95,  158,  158,  158,   18,   19,  158,
       115,  158,  158,  158,   99,  158,   17,    0
     } ;
 
@@ -1778,17 +1778,17 @@ return TOKEN_BLOOM_FILTER;
 case 20:
 YY_RULE_SETUP
 #line 186 "../SqlLexer.lpp"
-return TOKEN_CASE;
+return TOKEN_BY;
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
 #line 187 "../SqlLexer.lpp"
-return TOKEN_CSB_TREE;
+return TOKEN_CASE;
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
 #line 188 "../SqlLexer.lpp"
-return TOKEN_BY;
+return TOKEN_CHARACTER;
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
@@ -1798,32 +1798,32 @@ return TOKEN_CHARACTER;
 case 24:
 YY_RULE_SETUP
 #line 190 "../SqlLexer.lpp"
-return TOKEN_CHARACTER;
+return TOKEN_CHECK;
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
 #line 191 "../SqlLexer.lpp"
-return TOKEN_CHECK;
+return TOKEN_COLUMN;
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
 #line 192 "../SqlLexer.lpp"
-return TOKEN_COLUMN;
+return TOKEN_CONSTRAINT;
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
 #line 193 "../SqlLexer.lpp"
-return TOKEN_CONSTRAINT;
+return TOKEN_COPY;
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
 #line 194 "../SqlLexer.lpp"
-return TOKEN_COPY;
+return TOKEN_CREATE;
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
 #line 195 "../SqlLexer.lpp"
-return TOKEN_CREATE;
+return TOKEN_CSB_TREE;
 	YY_BREAK
 case 30:
 YY_RULE_SETUP


Mime
View raw message