You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@quickstep.apache.org by zu...@apache.org on 2016/05/05 06:16:46 UTC
[10/30] incubator-quickstep git commit: Merge pull request #170 from
pivotalsoftware/quickstep_date_support
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/0f79a9af/parser/preprocessed/SqlParser_gen.hpp
----------------------------------------------------------------------
diff --git a/parser/preprocessed/SqlParser_gen.hpp b/parser/preprocessed/SqlParser_gen.hpp
index b884861..72fa9ef 100644
--- a/parser/preprocessed/SqlParser_gen.hpp
+++ b/parser/preprocessed/SqlParser_gen.hpp
@@ -87,78 +87,84 @@ extern int quickstep_yydebug;
TOKEN_CREATE = 297,
TOKEN_DATE = 298,
TOKEN_DATETIME = 299,
- TOKEN_DECIMAL = 300,
- TOKEN_DEFAULT = 301,
- TOKEN_DELETE = 302,
- TOKEN_DELIMITER = 303,
- TOKEN_DESC = 304,
- TOKEN_DISTINCT = 305,
- TOKEN_DOUBLE = 306,
- TOKEN_DROP = 307,
- TOKEN_ELSE = 308,
- TOKEN_END = 309,
- TOKEN_ESCAPE_STRINGS = 310,
- TOKEN_EXISTS = 311,
- TOKEN_EXTRACT = 312,
- TOKEN_FALSE = 313,
- TOKEN_FIRST = 314,
- TOKEN_FLOAT = 315,
- TOKEN_FOREIGN = 316,
- TOKEN_FROM = 317,
- TOKEN_FULL = 318,
- TOKEN_GROUP = 319,
- TOKEN_HASH = 320,
- TOKEN_HAVING = 321,
- TOKEN_IN = 322,
- TOKEN_INDEX = 323,
- TOKEN_INNER = 324,
- TOKEN_INSERT = 325,
- TOKEN_INTEGER = 326,
- TOKEN_INTERVAL = 327,
- TOKEN_INTO = 328,
- TOKEN_JOIN = 329,
- TOKEN_KEY = 330,
- TOKEN_LAST = 331,
- TOKEN_LEFT = 332,
- TOKEN_LIMIT = 333,
- TOKEN_LONG = 334,
- TOKEN_NULL = 335,
- TOKEN_NULLS = 336,
- TOKEN_OFF = 337,
- TOKEN_ON = 338,
- TOKEN_ORDER = 339,
- TOKEN_OUTER = 340,
- TOKEN_PARTITION = 341,
- TOKEN_PARTITIONS = 342,
- TOKEN_PERCENT = 343,
- TOKEN_PRIMARY = 344,
- TOKEN_QUIT = 345,
- TOKEN_RANGE = 346,
- TOKEN_REAL = 347,
- TOKEN_REFERENCES = 348,
- TOKEN_RIGHT = 349,
- TOKEN_ROW_DELIMITER = 350,
- TOKEN_SELECT = 351,
- TOKEN_SET = 352,
- TOKEN_SMA = 353,
- TOKEN_SMALLINT = 354,
- TOKEN_TABLE = 355,
- TOKEN_THEN = 356,
- TOKEN_TIME = 357,
- TOKEN_TIMESTAMP = 358,
- TOKEN_TRUE = 359,
- TOKEN_TUPLESAMPLE = 360,
- TOKEN_UNIQUE = 361,
- TOKEN_UPDATE = 362,
- TOKEN_USING = 363,
- TOKEN_VALUES = 364,
- TOKEN_VARCHAR = 365,
- TOKEN_WHEN = 366,
- TOKEN_WHERE = 367,
- TOKEN_WITH = 368,
- TOKEN_YEARMONTH = 369,
- TOKEN_EOF = 370,
- TOKEN_LEX_ERROR = 371
+ TOKEN_DAY = 300,
+ TOKEN_DECIMAL = 301,
+ TOKEN_DEFAULT = 302,
+ TOKEN_DELETE = 303,
+ TOKEN_DELIMITER = 304,
+ TOKEN_DESC = 305,
+ TOKEN_DISTINCT = 306,
+ TOKEN_DOUBLE = 307,
+ TOKEN_DROP = 308,
+ TOKEN_ELSE = 309,
+ TOKEN_END = 310,
+ TOKEN_ESCAPE_STRINGS = 311,
+ TOKEN_EXISTS = 312,
+ TOKEN_EXTRACT = 313,
+ TOKEN_FALSE = 314,
+ TOKEN_FIRST = 315,
+ TOKEN_FLOAT = 316,
+ TOKEN_FOREIGN = 317,
+ TOKEN_FROM = 318,
+ TOKEN_FULL = 319,
+ TOKEN_GROUP = 320,
+ TOKEN_HASH = 321,
+ TOKEN_HAVING = 322,
+ TOKEN_HOUR = 323,
+ TOKEN_IN = 324,
+ TOKEN_INDEX = 325,
+ TOKEN_INNER = 326,
+ TOKEN_INSERT = 327,
+ TOKEN_INTEGER = 328,
+ TOKEN_INTERVAL = 329,
+ TOKEN_INTO = 330,
+ TOKEN_JOIN = 331,
+ TOKEN_KEY = 332,
+ TOKEN_LAST = 333,
+ TOKEN_LEFT = 334,
+ TOKEN_LIMIT = 335,
+ TOKEN_LONG = 336,
+ TOKEN_MINUTE = 337,
+ TOKEN_MONTH = 338,
+ TOKEN_NULL = 339,
+ TOKEN_NULLS = 340,
+ TOKEN_OFF = 341,
+ TOKEN_ON = 342,
+ TOKEN_ORDER = 343,
+ TOKEN_OUTER = 344,
+ TOKEN_PARTITION = 345,
+ TOKEN_PARTITIONS = 346,
+ TOKEN_PERCENT = 347,
+ TOKEN_PRIMARY = 348,
+ TOKEN_QUIT = 349,
+ TOKEN_RANGE = 350,
+ TOKEN_REAL = 351,
+ TOKEN_REFERENCES = 352,
+ TOKEN_RIGHT = 353,
+ TOKEN_ROW_DELIMITER = 354,
+ TOKEN_SECOND = 355,
+ TOKEN_SELECT = 356,
+ TOKEN_SET = 357,
+ TOKEN_SMA = 358,
+ TOKEN_SMALLINT = 359,
+ TOKEN_TABLE = 360,
+ TOKEN_THEN = 361,
+ TOKEN_TIME = 362,
+ TOKEN_TIMESTAMP = 363,
+ TOKEN_TRUE = 364,
+ TOKEN_TUPLESAMPLE = 365,
+ TOKEN_UNIQUE = 366,
+ TOKEN_UPDATE = 367,
+ TOKEN_USING = 368,
+ TOKEN_VALUES = 369,
+ TOKEN_VARCHAR = 370,
+ TOKEN_WHEN = 371,
+ TOKEN_WHERE = 372,
+ TOKEN_WITH = 373,
+ TOKEN_YEAR = 374,
+ TOKEN_YEARMONTH = 375,
+ TOKEN_EOF = 376,
+ TOKEN_LEX_ERROR = 377
};
#endif
@@ -250,7 +256,7 @@ union YYSTYPE
quickstep::ParseOrderBy *opt_order_by_clause_;
bool *order_direction_;
quickstep::ParseLimit *opt_limit_clause_;
-
+
quickstep::ParseSample *opt_sample_clause_;
quickstep::PtrList<quickstep::ParseOrderByItem> *order_commalist_;
@@ -259,7 +265,7 @@ union YYSTYPE
quickstep::PtrVector<quickstep::ParseSubqueryTableReference> *with_list_;
quickstep::ParseSubqueryTableReference *with_list_element_;
-#line 263 "SqlParser_gen.hpp" /* yacc.c:1915 */
+#line 269 "SqlParser_gen.hpp" /* yacc.c:1915 */
};
typedef union YYSTYPE YYSTYPE;
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/0f79a9af/parser/tests/TPCH.test
----------------------------------------------------------------------
diff --git a/parser/tests/TPCH.test b/parser/tests/TPCH.test
index 12d85ce..7f4d911 100644
--- a/parser/tests/TPCH.test
+++ b/parser/tests/TPCH.test
@@ -532,7 +532,7 @@ FROM
SELECT
n1.n_name AS supp_nation,
n2.n_name AS cust_nation,
- EXTRACT(year FROM l_shipdate) AS l_year,
+ EXTRACT(YEAR FROM l_shipdate) AS l_year,
l_extendedprice * (1 - l_discount) AS volume
FROM
supplier,
@@ -596,7 +596,7 @@ SelectStatement
| +-SelectListItem[alias=cust_nation]
| | +-AttributeReference[attribute_name=n_name,relation_name=n2]
| +-SelectListItem[alias=l_year]
- | | +-Extract[unit=year]
+ | | +-Extract[unit=YEAR]
| | +-date_expression=AttributeReference[attribute_name=l_shipdate]
| +-SelectListItem[alias=volume]
| +-Multiply
@@ -673,7 +673,7 @@ SELECT
FROM
(
SELECT
- EXTRACT(year FROM o_orderdate) AS o_year,
+ EXTRACT(YEAR FROM o_orderdate) AS o_year,
l_extendedprice * (1 - l_discount) AS volume,
n2.n_name AS nation
FROM
@@ -734,7 +734,7 @@ SelectStatement
+-Select
+-select_clause=SelectList
| +-SelectListItem[alias=o_year]
- | | +-Extract[unit=year]
+ | | +-Extract[unit=YEAR]
| | +-date_expression=AttributeReference[attribute_name=o_orderdate]
| +-SelectListItem[alias=volume]
| | +-Multiply
@@ -858,7 +858,7 @@ SelectStatement
| +-SelectListItem[alias=nation]
| | +-AttributeReference[attribute_name=n_name]
| +-SelectListItem[alias=o_year]
- | | +-Extract[unit=year]
+ | | +-Extract[unit=YEAR]
| | +-date_expression=AttributeReference[attribute_name=o_orderdate]
| +-SelectListItem[alias=amount]
| +-Subtract
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/0f79a9af/query_optimizer/tests/execution_generator/Select.test
----------------------------------------------------------------------
diff --git a/query_optimizer/tests/execution_generator/Select.test b/query_optimizer/tests/execution_generator/Select.test
index 47c1077..438546c 100644
--- a/query_optimizer/tests/execution_generator/Select.test
+++ b/query_optimizer/tests/execution_generator/Select.test
@@ -662,11 +662,11 @@ FROM dates;
+-------------------------------+
==
-SELECT EXTRACT(hour FROM value + INTERVAL '1 hour')
+SELECT EXTRACT(HOUR FROM value + INTERVAL '1 hour')
FROM dates;
--
+-----------------------------------------------------+
-|EXTRACT(hour FROM (value+DatetimeInterval('1 hour')))|
+|EXTRACT(HOUR FROM (value+DatetimeInterval('1 hour')))|
+-----------------------------------------------------+
| 11|
| 12|