Changeset: d59ea176294d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d59ea176294d Added Files: sql/backends/monet5/Tests/cquery16.sql sql/backends/monet5/Tests/cquery16.stable.err sql/backends/monet5/Tests/cquery16.stable.out Modified Files: sql/backends/monet5/Tests/All sql/backends/monet5/Tests/cquery14.sql sql/backends/monet5/sql_cat.c sql/server/rel_psm.c Branch: trails Log Message:
If the UDF does not exist, return the error. diffs (232 lines): diff --git a/sql/backends/monet5/Tests/All b/sql/backends/monet5/Tests/All --- a/sql/backends/monet5/Tests/All +++ b/sql/backends/monet5/Tests/All @@ -101,6 +101,7 @@ cquery12 cquery13 cquery14 cquery15 +cquery16 cqstream00 cqstream01 diff --git a/sql/backends/monet5/Tests/cquery14.sql b/sql/backends/monet5/Tests/cquery14.sql --- a/sql/backends/monet5/Tests/cquery14.sql +++ b/sql/backends/monet5/Tests/cquery14.sql @@ -19,8 +19,8 @@ call cquery.wait(2500); select count(*) from results14; --should be 2 +drop procedure sys.cq_query14b; drop procedure sys.cq_query14a; -drop procedure sys.cq_query14b; drop table testing14; drop table results14; diff --git a/sql/backends/monet5/Tests/cquery16.sql b/sql/backends/monet5/Tests/cquery16.sql new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/Tests/cquery16.sql @@ -0,0 +1,25 @@ +--cannot start a CQ from a procedure that does not exist +create stream table testing16 (a int) set window 1; +create table results16 (a int); + +start continuous sys.cq_query16a(); --error + +create procedure cq_query16b() --error +begin + start continuous sys.cq_query16a(); +end; + +create procedure cq_query16a() +begin + insert into results16 (select * from testing16); +end; + +insert into testing16 values (1); +start continuous sys.cq_query16a() with cycles 1; + +call cquery.wait(1000); + +drop procedure sys.cq_query16a; + +drop table testing16; +drop table results16; diff --git a/sql/backends/monet5/Tests/cquery16.stable.err b/sql/backends/monet5/Tests/cquery16.stable.err new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/Tests/cquery16.stable.err @@ -0,0 +1,47 @@ +stderr of test 'cquery16` in directory 'sql/backends/monet5` itself: + + +# 15:37:36 > +# 15:37:36 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=37794" "--set" "mapi_usock=/var/tmp/mtest-25778/.s.monetdb.37794" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/ferreira/MonetDB-trails/BUILD/var/MonetDB/mTests_sql_backends_monet5" "--set" "embedded_r=yes" "--set" "embedded_py=true" +# 15:37:36 > + +# builtin opt gdk_dbpath = /home/ferreira/MonetDB-trails/BUILD/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# builtin opt gdk_vmtrim = no +# builtin opt monet_prompt = > +# builtin opt monet_daemon = no +# builtin opt mapi_port = 50000 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 37794 +# cmdline opt mapi_usock = /var/tmp/mtest-25778/.s.monetdb.37794 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = /home/ferreira/MonetDB-trails/BUILD/var/MonetDB/mTests_sql_backends_monet5 +# cmdline opt embedded_r = yes +# cmdline opt embedded_py = true +# cmdline opt gdk_debug = 536870922 + +# 15:37:37 > +# 15:37:37 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-25778" "--port=37794" +# 15:37:37 > + +MAPI = (monetdb) /var/tmp/mtest-25778/.s.monetdb.37794 +QUERY = start continuous sys.cq_query16a(); --error +ERROR = !SELECT: no such operator 'cq_query16a' +CODE = 42000 +MAPI = (monetdb) /var/tmp/mtest-25778/.s.monetdb.37794 +QUERY = create procedure cq_query16b() --error + begin + start continuous sys.cq_query16a(); + end; +ERROR = !SELECT: no such operator 'cq_query16a' +CODE = 42000 + +# 15:37:38 > +# 15:37:38 > "Done." +# 15:37:38 > + diff --git a/sql/backends/monet5/Tests/cquery16.stable.out b/sql/backends/monet5/Tests/cquery16.stable.out new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/Tests/cquery16.stable.out @@ -0,0 +1,86 @@ +stdout of test 'cquery16` in directory 'sql/backends/monet5` itself: + + +# 15:37:36 > +# 15:37:36 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=37794" "--set" "mapi_usock=/var/tmp/mtest-25778/.s.monetdb.37794" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/ferreira/MonetDB-trails/BUILD/var/MonetDB/mTests_sql_backends_monet5" "--set" "embedded_r=yes" "--set" "embedded_py=true" +# 15:37:36 > + +# MonetDB 5 server v11.28.0 +# This is an unreleased version +# Serving database 'mTests_sql_backends_monet5', using 8 threads +# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers +# Found 15.498 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved +# Visit https://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://dhcp-120.eduroam.cwi.nl:37794/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-25778/.s.monetdb.37794 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +# MonetDB/Timetrails module loaded +# MonetDB/Python2 module loaded +# MonetDB/R module loaded + +Ready. +# 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_temporal.sql +# loading sql script: 18_index.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: 25_debug.sql +# loading sql script: 26_sysmon.sql +# loading sql script: 27_rejects.sql +# loading sql script: 39_analytics.sql +# loading sql script: 39_analytics_hge.sql +# loading sql script: 40_geom.sql +# loading sql script: 40_json.sql +# loading sql script: 40_json_hge.sql +# loading sql script: 41_md5sum.sql +# loading sql script: 45_uuid.sql +# loading sql script: 46_profiler.sql +# loading sql script: 50_cquery.sql +# loading sql script: 51_sys_schema_extension.sql +# loading sql script: 60_wlcr.sql +# loading sql script: 72_fits.sql +# loading sql script: 74_netcdf.sql +# loading sql script: 75_lidar.sql +# loading sql script: 75_shp.sql +# loading sql script: 75_storagemodel.sql +# loading sql script: 80_statistics.sql +# loading sql script: 80_udf.sql +# loading sql script: 80_udf_hge.sql +# loading sql script: 85_bam.sql +# loading sql script: 90_generator.sql +# loading sql script: 90_generator_hge.sql +# loading sql script: 99_system.sql + +# 15:37:37 > +# 15:37:37 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-25778" "--port=37794" +# 15:37:37 > + +#create stream table testing16 (a int) set window 1; +#create table results16 (a int); +#create procedure cq_query16a() +#begin +# insert into results16 (select * from testing16); +#end; +#insert into testing16 values (1); +[ 1 ] +#drop procedure sys.cq_query16a; +#drop table testing16; +#drop table results16; + +# 15:37:38 > +# 15:37:38 > "Done." +# 15:37:38 > + diff --git a/sql/backends/monet5/sql_cat.c b/sql/backends/monet5/sql_cat.c --- a/sql/backends/monet5/sql_cat.c +++ b/sql/backends/monet5/sql_cat.c @@ -443,9 +443,8 @@ change_single_cp(str alias, int action, return CQpause(alias, action); } else if(action & mod_stop_continuous) { return CQderegister(alias, action); - } else { - throw(SQL,"sql.change_single_cp", SQLSTATE(342000) "ALL CONTINUOUS: Unknown option"); } + assert(0); } static str @@ -459,7 +458,7 @@ change_all_cp(int action) case mod_stop_all_continuous: return CQderegisterAll(); default: - throw(SQL,"sql.change_all_cp", SQLSTATE(342000) "ALL CONTINUOUS: Unknown option"); + assert(0); } } diff --git a/sql/server/rel_psm.c b/sql/server/rel_psm.c --- a/sql/server/rel_psm.c +++ b/sql/server/rel_psm.c @@ -162,6 +162,8 @@ rel_psm_call(mvc * sql, symbol *se, list sql_rel *rel = NULL; res = rel_value_exp(sql, &rel, se, sql_sel, ek); + if(sql->session->status) //there are errors in the generated expression, hence return + return NULL; ((sql_subfunc *)res->f)->cqparamters = cq_parameters; //for CQs we set the extra parameters here /* only procedures or continuous queries */ _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
