Changeset: 3127f0984f49 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3127f0984f49
Modified Files:
sql/scripts/51_sys_schema_extension.sql
sql/server/sql_parser.y
sql/server/sql_scan.c
Branch: trails
Log Message:
Changed keyword for CQ
diffs (144 lines):
diff --git a/sql/scripts/51_sys_schema_extension.sql
b/sql/scripts/51_sys_schema_extension.sql
--- a/sql/scripts/51_sys_schema_extension.sql
+++ b/sql/scripts/51_sys_schema_extension.sql
@@ -40,12 +40,14 @@ INSERT INTO sys.keywords (keyword) VALUE
('CHAR'),
('CHARACTER'),
('CHECK'),
+ ('CLOCK'),
('CLOB'),
('COALESCE'),
('COMMENT'),
('COMMIT'),
('COMMITTED'),
('CONSTRAINT'),
+ ('CONTINUOUS'),
('CONVERT'),
('COPY'),
('CORRESPONDING'),
@@ -57,6 +59,7 @@ INSERT INTO sys.keywords (keyword) VALUE
('CURRENT_TIME'),
('CURRENT_TIMESTAMP'),
('CURRENT_USER'),
+ ('CYCLES'),
('DAY'),
('DEC'),
('DECIMAL'),
@@ -94,6 +97,7 @@ INSERT INTO sys.keywords (keyword) VALUE
('GRANT'),
('GROUP'),
('HAVING'),
+ ('HEARTBEAT'),
('HOUR'),
('HUGEINT'),
('IDENTITY'),
@@ -145,6 +149,7 @@ INSERT INTO sys.keywords (keyword) VALUE
('OVER'),
('PARTIAL'),
('PARTITION'),
+ ('PAUSE'),
('POSITION'),
('PRECEDING'),
('PRESERVE'),
@@ -164,6 +169,7 @@ INSERT INTO sys.keywords (keyword) VALUE
('REPLICA'),
('RESTART'),
('RESTRICT'),
+ ('RESUME'),
('RETURN'),
('RETURNS'),
('REVOKE'),
@@ -185,8 +191,10 @@ INSERT INTO sys.keywords (keyword) VALUE
('SPLIT_PART'),
('STDIN'),
('STDOUT'),
+ ('STOP'),
('STORAGE'),
('STREAM'),
+ ('STRIDE'),
('STRING'),
('SUBSTRING'),
('SYMMETRIC'),
@@ -212,6 +220,7 @@ INSERT INTO sys.keywords (keyword) VALUE
('WHEN'),
('WHERE'),
('WHILE'),
+ ('WINDOW'),
('WITH'),
('WORK'),
('WRITE'),
diff --git a/sql/server/sql_parser.y b/sql/server/sql_parser.y
--- a/sql/server/sql_parser.y
+++ b/sql/server/sql_parser.y
@@ -237,7 +237,7 @@ int yydebug=1;
simple_atom
value
literal
- begin_at_set
+ clock_at_set
null
interval_expression
ordering_spec
@@ -548,7 +548,7 @@ int yydebug=1;
%token <sval> LATERAL LEFT RIGHT FULL OUTER NATURAL CROSS JOIN INNER
%token <sval> COMMIT ROLLBACK SAVEPOINT RELEASE WORK CHAIN NO PRESERVE ROWS
%token CONTINUOUS START_CONTINUOUS STOP STOP_CONTINUOUS PAUSE
PAUSE_CONTINUOUS RESUME RESUME_CONTINUOUS
-%token WINDOW NO_WINDOW STRIDE NO_STRIDE HEARTBEAT NO_HEARTBEAT NO_BEGIN
CYCLES NO_CYCLES
+%token WINDOW NO_WINDOW STRIDE NO_STRIDE HEARTBEAT NO_HEARTBEAT CLOCK
NO_CLOCK CYCLES NO_CYCLES
%token START TRANSACTION READ WRITE ONLY ISOLATION LEVEL
%token UNCOMMITTED COMMITTED sqlREPEATABLE SERIALIZABLE DIAGNOSTICS sqlSIZE
STORAGE
@@ -2187,10 +2187,10 @@ heartbeat_set:
| NO_HEARTBEAT { $$ = DEFAULT_CP_HEARTBEAT; }
;
-begin_at_set:
+clock_at_set:
/* empty */ { $$ = NULL; } /* CQ not delayed, so starts now */
- | BEGIN literal { $$ = $2; }
- | NO_BEGIN { $$ = NULL; }
+ | CLOCK literal { $$ = $2; }
+ | NO_CLOCK { $$ = NULL; }
;
cycles_set:
@@ -2205,7 +2205,7 @@ cq_alias:
;
continuous_query_statement:
- START_CONTINUOUS database_object func_ref WITH heartbeat_set
begin_at_set cycles_set cq_alias
+ START_CONTINUOUS database_object func_ref WITH heartbeat_set
clock_at_set cycles_set cq_alias
{ dlist *l = L();
append_int( l, mod_start_continuous | $2);
append_symbol( l, $3);
@@ -2233,7 +2233,7 @@ continuous_query_statement:
append_int( l, mod_pause_continuous);
append_string( l, $2);
$$ = _symbol_create_list( SQL_CHANGE_CONTINUOUS_QUERY, l ); }
- | RESUME_CONTINUOUS ident WITH heartbeat_set begin_at_set cycles_set
+ | RESUME_CONTINUOUS ident WITH heartbeat_set clock_at_set cycles_set
{ dlist *l = L();
append_int( l, mod_resume_continuous);
append_string( l, $2);
diff --git a/sql/server/sql_scan.c b/sql/server/sql_scan.c
--- a/sql/server/sql_scan.c
+++ b/sql/server/sql_scan.c
@@ -333,6 +333,7 @@ scanner_init_keywords(void)
failed += keywords_insert("STRIDE", STRIDE);
failed += keywords_insert("HEARTBEAT", HEARTBEAT);
failed += keywords_insert("CYCLES", CYCLES);
+ failed += keywords_insert("CLOCK", CLOCK);
failed += keywords_insert("RESUME", RESUME);
failed += keywords_insert("TRANSACTION", TRANSACTION);
failed += keywords_insert("READ", READ);
@@ -1348,8 +1349,8 @@ sqllex(YYSTYPE * yylval, void *parm)
case HEARTBEAT:
token = NO_HEARTBEAT;
break;
- case BEGIN:
- token = NO_BEGIN;
+ case CLOCK:
+ token = NO_CLOCK;
break;
case CYCLES:
token = NO_CYCLES;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
