Changeset: 3fc666997e8f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3fc666997e8f
Modified Files:
clients/R/Tests/deps-install.timeout
sql/backends/monet5/sql_scenario.c
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.sql
sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.stable.out
sql/test/sys-schema/Tests/systemfunctions.sql
sql/test/sys-schema/Tests/systemfunctions.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
Branch: default
Log Message:
Merge with Apr2019 branch.
diffs (275 lines):
diff --git a/clients/R/Tests/deps-install.timeout
b/clients/R/Tests/deps-install.timeout
--- a/clients/R/Tests/deps-install.timeout
+++ b/clients/R/Tests/deps-install.timeout
@@ -1,1 +1,1 @@
-2
+20
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -719,12 +719,11 @@ SQLcompile(Client cntxt, MalBlkPtr mb, M
(void) mb;
*ret = NULL;
- msg = SQLstatementIntern(cntxt, expr, "SQLcompile", FALSE, FALSE, NULL);
- if (msg == MAL_SUCCEED)
- *ret = _STRDUP("SQLcompile");
- if(*ret == NULL)
+ if ((msg = SQLstatementIntern(cntxt, expr, "SQLcompile", FALSE, FALSE,
NULL)) != MAL_SUCCEED)
+ return msg;
+ if((*ret = _STRDUP("SQLcompile")) == NULL)
throw(SQL,"sql.compile",SQLSTATE(HY001) MAL_MALLOC_FAIL);
- return msg;
+ return MAL_SUCCEED;
}
/*
diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -697,7 +697,6 @@ mvc_create(int clientid, backend_stack s
m->type = Q_PARSE;
m->pushdown = 1;
- m->has_groupby_expressions = false;
m->result_id = 0;
m->results = NULL;
@@ -764,7 +763,6 @@ mvc_reset(mvc *m, bstream *rs, stream *w
m->cascade_action = NULL;
m->type = Q_PARSE;
m->pushdown = 1;
- m->has_groupby_expressions = false;
for(i=0;i<MAXSTATS;i++)
m->opt_stats[i] = 0;
@@ -1637,20 +1635,15 @@ stack_push_groupby_expression(mvc *sql,
if(res)
sql->topvars++;
}
- sql->has_groupby_expressions = true;
return res;
}
sql_exp*
stack_get_groupby_expression(mvc *sql, symbol *def)
{
- if(sql->has_groupby_expressions) {
- for (int i = sql->topvars-1; i >= 0; i--) {
- if (!sql->vars[i].frame && sql->vars[i].exp &&
sql->vars[i].exp->token == def->token && symbol_cmp(sql,
sql->vars[i].exp->sdef, def)==0) {
- return sql->vars[i].exp->exp;
- }
- }
- }
+ for (int i = sql->topvars-1; i >= 0; i--)
+ if (!sql->vars[i].frame && sql->vars[i].exp &&
sql->vars[i].exp->token == def->token && symbol_cmp(sql,
sql->vars[i].exp->sdef, def)==0)
+ return sql->vars[i].exp->exp;
return NULL;
}
diff --git a/sql/server/sql_mvc.h b/sql/server/sql_mvc.h
--- a/sql/server/sql_mvc.h
+++ b/sql/server/sql_mvc.h
@@ -107,7 +107,6 @@ typedef struct mvc {
int argmax;
struct symbol *sym;
int no_mitosis; /* run query without mitosis */
- bool has_groupby_expressions;
sqlid user_id;
sqlid role_id;
diff --git a/sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.sql
b/sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.sql
--- a/sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.sql
+++ b/sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.sql
@@ -1,11 +1,23 @@
create schema marketdata;
+
create table marketdata.quotes (i integer);
+
CREATE TRIGGER marketdata.calc_sdate BEFORE INSERT ON marketdata.quotes
FOR EACH ROW
BEGIN ATOMIC
-- select * from marketdata.quotes limit 1;
+ update marketdata.quotes set i = i +2 where i < 2;
END;
---syntax error, unexpected '.', expecting WHILE in: "create trigger
marketdata.calc_sdate before insert on marketdata."
+
+insert into marketdata.quotes (i) values (1);
+select * from marketdata.quotes;
+insert into marketdata.quotes (i) values (2);
+select * from marketdata.quotes;
+insert into marketdata.quotes (i) values (1);
+select * from marketdata.quotes;
+insert into marketdata.quotes (i) values (2);
+select * from marketdata.quotes;
+
drop trigger marketdata.calc_sdate;
drop table marketdata.quotes;
drop schema marketdata;
diff --git a/sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.stable.out
b/sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.stable.out
--- a/sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.stable.out
+++ b/sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.stable.out
@@ -30,6 +30,51 @@ stdout of test 'schema-trigger.Bug-3710`
#create schema marketdata;
#create table marketdata.quotes (i integer);
+#CREATE TRIGGER marketdata.calc_sdate BEFORE INSERT ON marketdata.quotes
+#FOR EACH ROW
+#BEGIN ATOMIC
+#-- select * from marketdata.quotes limit 1;
+# update marketdata.quotes set i = i +2 where i < 2;
+#END;
+#insert into marketdata.quotes (i) values (1);
+[ 1 ]
+#select * from marketdata.quotes;
+% marketdata.quotes # table_name
+% i # name
+% int # type
+% 1 # length
+[ 1 ]
+#insert into marketdata.quotes (i) values (2);
+[ 1 ]
+#select * from marketdata.quotes;
+% marketdata.quotes # table_name
+% i # name
+% int # type
+% 1 # length
+[ 3 ]
+[ 2 ]
+#insert into marketdata.quotes (i) values (1);
+[ 1 ]
+#select * from marketdata.quotes;
+% marketdata.quotes # table_name
+% i # name
+% int # type
+% 1 # length
+[ 3 ]
+[ 2 ]
+[ 1 ]
+#insert into marketdata.quotes (i) values (2);
+[ 1 ]
+#select * from marketdata.quotes;
+% marketdata.quotes # table_name
+% i # name
+% int # type
+% 1 # length
+[ 3 ]
+[ 2 ]
+[ 3 ]
+[ 2 ]
+#drop trigger marketdata.calc_sdate;
#drop table marketdata.quotes;
#drop schema marketdata;
diff --git a/sql/test/sys-schema/Tests/systemfunctions.stable.out
b/sql/test/sys-schema/Tests/systemfunctions.stable.out
--- a/sql/test/sys-schema/Tests/systemfunctions.stable.out
+++ b/sql/test/sys-schema/Tests/systemfunctions.stable.out
@@ -5,46 +5,17 @@ stdout of test 'systemfunctions` in dire
# 16:20:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36066" "--set"
"mapi_usock=/var/tmp/mtest-26153/.s.monetdb.36066" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test" "--set"
"mal_listing=0"
# 16:20:24 >
-# MonetDB 5 server v11.17.0 (hg id: d91089635868)
+# MonetDB 5 server v11.33.4 (hg id: e20e95cd4eff+)
# This is an unreleased version
# Serving database 'mTests_sql_test', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Found 15.591 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
-# Visit http://www.monetdb.org/ for further information
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit integers
+# Found 31.305 GiB available main-memory.
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2019 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
# Listening for connection requests on mapi:monetdb://madrid.ins.cwi.nl:36066/
# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-26153/.s.monetdb.36066
# MonetDB/GIS module loaded
-# SQL catalog created, loading sql scripts once
-# loading sql script: 09_like.sql
-# loading sql script: 10_math.sql
-# loading sql script: 11_times.sql
-# loading sql script: 12_url.sql
-# loading sql script: 13_date.sql
-# loading sql script: 14_inet.sql
-# loading sql script: 15_querylog.sql
-# loading sql script: 16_tracelog.sql
-# loading sql script: 17_compress.sql
-# loading sql script: 18_dictionary.sql
-# loading sql script: 19_cluster.sql
-# loading sql script: 20_vacuum.sql
-# loading sql script: 21_dependency_functions.sql
-# loading sql script: 22_clients.sql
-# loading sql script: 23_skyserver.sql
-# loading sql script: 24_zorder.sql
-# loading sql script: 25_debug.sql
-# loading sql script: 26_sysmon.sql
-# loading sql script: 39_analytics.sql
-# loading sql script: 40_geom.sql
-# loading sql script: 40_json.sql
-# loading sql script: 41_md5sum.sql
-# loading sql script: 45_uuid.sql
-# loading sql script: 46_gsl.sql
-# loading sql script: 75_storagemodel.sql
-# loading sql script: 80_statistics.sql
-# loading sql script: 80_udf.sql
-# loading sql script: 99_system.sql
# MonetDB/SQL module loaded
diff --git a/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
b/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
--- a/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
+++ b/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
@@ -5,46 +5,17 @@ stdout of test 'systemfunctions` in dire
# 16:20:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36066" "--set"
"mapi_usock=/var/tmp/mtest-26153/.s.monetdb.36066" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test" "--set"
"mal_listing=0"
# 16:20:24 >
-# MonetDB 5 server v11.17.0 (hg id: d91089635868)
+# MonetDB 5 server v11.33.4 (hg id: e20e95cd4eff+)
# This is an unreleased version
# Serving database 'mTests_sql_test', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Found 15.591 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
-# Visit http://www.monetdb.org/ for further information
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 31.305 GiB available main-memory.
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2019 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
# Listening for connection requests on mapi:monetdb://madrid.ins.cwi.nl:36066/
# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-26153/.s.monetdb.36066
# MonetDB/GIS module loaded
-# SQL catalog created, loading sql scripts once
-# loading sql script: 09_like.sql
-# loading sql script: 10_math.sql
-# loading sql script: 11_times.sql
-# loading sql script: 12_url.sql
-# loading sql script: 13_date.sql
-# loading sql script: 14_inet.sql
-# loading sql script: 15_querylog.sql
-# loading sql script: 16_tracelog.sql
-# loading sql script: 17_compress.sql
-# loading sql script: 18_dictionary.sql
-# loading sql script: 19_cluster.sql
-# loading sql script: 20_vacuum.sql
-# loading sql script: 21_dependency_functions.sql
-# loading sql script: 22_clients.sql
-# loading sql script: 23_skyserver.sql
-# loading sql script: 24_zorder.sql
-# loading sql script: 25_debug.sql
-# loading sql script: 26_sysmon.sql
-# loading sql script: 39_analytics.sql
-# loading sql script: 40_geom.sql
-# loading sql script: 40_json.sql
-# loading sql script: 41_md5sum.sql
-# loading sql script: 45_uuid.sql
-# loading sql script: 46_gsl.sql
-# loading sql script: 75_storagemodel.sql
-# loading sql script: 80_statistics.sql
-# loading sql script: 80_udf.sql
-# loading sql script: 99_system.sql
# MonetDB/SQL module loaded
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
