Changeset: a3a5b02e8cea for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a3a5b02e8cea Added Files: sql/backends/monet5/Tests/cquery13.stable.err sql/backends/monet5/Tests/cquery13.stable.out Modified Files: sql/backends/monet5/sql_cquery.c Branch: trails Log Message:
Compilation fix, plus stopping continuous queries within others. diffs (149 lines): diff --git a/sql/backends/monet5/Tests/cquery13.stable.err b/sql/backends/monet5/Tests/cquery13.stable.err new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/Tests/cquery13.stable.err @@ -0,0 +1,36 @@ +stderr of test 'cquery13` in directory 'sql/backends/monet5` itself: + + +# 13:07:42 > +# 13:07:42 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=35524" "--set" "mapi_usock=/var/tmp/mtest-29293/.s.monetdb.35524" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/ferreira/MonetDB-trails/BUILD/var/MonetDB/mTests_sql_backends_monet5" "--set" "embedded_r=yes" "--set" "embedded_py=true" +# 13:07:42 > + +# 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 = 35524 +# cmdline opt mapi_usock = /var/tmp/mtest-29293/.s.monetdb.35524 +# 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 + +# 13:07:42 > +# 13:07:42 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-29293" "--port=35524" +# 13:07:42 > + + +# 13:07:45 > +# 13:07:45 > "Done." +# 13:07:45 > + diff --git a/sql/backends/monet5/Tests/cquery13.stable.out b/sql/backends/monet5/Tests/cquery13.stable.out new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/Tests/cquery13.stable.out @@ -0,0 +1,87 @@ +stdout of test 'cquery13` in directory 'sql/backends/monet5` itself: + + +# 13:07:42 > +# 13:07:42 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=35524" "--set" "mapi_usock=/var/tmp/mtest-29293/.s.monetdb.35524" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/ferreira/MonetDB-trails/BUILD/var/MonetDB/mTests_sql_backends_monet5" "--set" "embedded_r=yes" "--set" "embedded_py=true" +# 13:07:42 > + +# 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:35524/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-29293/.s.monetdb.35524 +# 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 + +# 13:07:42 > +# 13:07:42 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-29293" "--port=35524" +# 13:07:42 > + +#create table testing13 (a int); +#create procedure cq_query13a() +#begin +# insert into testing13 values (1); +#end; +#create procedure cq_query13b() +#begin +# stop continuous cq_query13a; +#end; +#drop procedure sys.cq_query13a; +#drop procedure sys.cq_query13b; +#drop table testing13; + +# 13:07:45 > +# 13:07:45 > "Done." +# 13:07:45 > + diff --git a/sql/backends/monet5/sql_cquery.c b/sql/backends/monet5/sql_cquery.c --- a/sql/backends/monet5/sql_cquery.c +++ b/sql/backends/monet5/sql_cquery.c @@ -1244,11 +1244,10 @@ CQscheduler(void *dummy) pnet[i].enabled = 0; CQentry(i); } - for(i = pnettop ; i > 0; i--) { //more defensive way to stop continuous queries from the scheduler itself + for(i = pnettop - 1; i >= 0; i--) { //more defensive way to stop continuous queries from the scheduler itself if( pnet[i].status == CQDELETE){ CQfree(i); } - i--; } if( pnettop == 0) pnstatus = CQSTOP; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
