Changeset: 8455d3abe150 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8455d3abe150
Added Files:
sql/test/BugTracker-2014/Tests/queueError.Bug-3604.sql
sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.err
sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.out
Modified Files:
monetdb5/mal/mal_interpreter.c
sql/test/BugTracker-2014/Tests/All
Branch: Oct2014
Log Message:
Fix the SQL queue error 3604
diffs (156 lines):
diff --git a/monetdb5/mal/mal_interpreter.c b/monetdb5/mal/mal_interpreter.c
--- a/monetdb5/mal/mal_interpreter.c
+++ b/monetdb5/mal/mal_interpreter.c
@@ -760,6 +760,7 @@ str runMALsequence(Client cntxt, MalBlkP
/* monitoring information should reflect the input
arguments,
which may be removed by garbage collection */
runtimeProfileExit(cntxt, mb, stk, pci,
&runtimeProfile);
+ runtimeProfileFinish(cntxt, mb);
/* check for strong debugging after each MAL statement
*/
if ( pci->token != FACcall && ret== MAL_SUCCEED) {
if (GDKdebug & (CHECKMASK|PROPMASK) &&
exceptionVar < 0) {
diff --git a/sql/test/BugTracker-2014/Tests/All
b/sql/test/BugTracker-2014/Tests/All
--- a/sql/test/BugTracker-2014/Tests/All
+++ b/sql/test/BugTracker-2014/Tests/All
@@ -46,3 +46,4 @@ nil_2dec_lng.Bug-3592
manifold.Bug-3556
duplicate_primary_keys.Bug-3474
copy_decimal_into.Bug-3596
+queueError.Bug-3604
diff --git a/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.sql
b/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.sql
@@ -0,0 +1,5 @@
+select qtag,user,status,query from sys.queue();
+drop table xyz;
+select qtag,user,status,query from sys.queue();
+drop table yz;
+select qtag,user,status,query from sys.queue();
diff --git a/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.err
b/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.err
@@ -0,0 +1,42 @@
+stderr of test 'queueError.Bug-3604` in directory 'sql/test/BugTracker-2014`
itself:
+
+
+# 11:43:51 >
+# 11:43:51 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35114" "--set"
"mapi_usock=/var/tmp/mtest-3599/.s.monetdb.35114" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/Oct2014//Linux/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 11:43:51 >
+
+# builtin opt gdk_dbpath =
/export/scratch1/mk/Oct2014//Linux/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 = 35114
+# cmdline opt mapi_usock = /var/tmp/mtest-3599/.s.monetdb.35114
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/export/scratch1/mk/Oct2014//Linux/var/MonetDB/mTests_sql_test_BugTracker-2014
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+
+MAPI = (monetdb) /var/tmp/mtest-31705/.s.monetdb.38458
+QUERY = drop table xyz;
+ERROR = !DROP TABLE: no such table 'xyz'
+MAPI = (monetdb) /var/tmp/mtest-31705/.s.monetdb.38458
+QUERY = drop table yz;
+ERROR = !DROP TABLE: no such table 'yz'
+
+
+
+# 11:43:52 >
+# 11:43:52 > "Done."
+# 11:43:52 >
+
diff --git a/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.out
b/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.out
@@ -0,0 +1,75 @@
+stdout of test 'queueError.Bug-3604` in directory 'sql/test/BugTracker-2014`
itself:
+
+
+# 11:43:51 >
+# 11:43:51 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35114" "--set"
"mapi_usock=/var/tmp/mtest-3599/.s.monetdb.35114" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/Oct2014//Linux/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 11:43:51 >
+
+# MonetDB 5 server v11.19.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2014', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.590 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:35114/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-3599/.s.monetdb.35114
+# MonetDB/GIS module loaded
+# MonetDB/SQL 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: 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_jsonstore.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: 90_generator.sql
+# loading sql script: 99_system.sql
+
+# 11:43:52 >
+# 11:43:52 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-3599" "--port=35114"
+# 11:43:52 >
+
+#select qtag,user,status,query from sys.queue();
+% .L, .L1, .L1, .L1 # table_name
+% qtag, L1, status, query # name
+% bigint, varchar, clob, clob # type
+% 1, 0, 0, 0 # length
+#select qtag,user,status,query from sys.queue();
+% .L, .L1, .L1, .L1 # table_name
+% qtag, L1, status, query # name
+% bigint, varchar, clob, clob # type
+% 1, 0, 0, 0 # length
+#select qtag,user,status,query from sys.queue();
+% .L, .L1, .L1, .L1 # table_name
+% qtag, L1, status, query # name
+% bigint, varchar, clob, clob # type
+% 1, 0, 0, 0 # length
+
+# 11:43:52 >
+# 11:43:52 > "Done."
+# 11:43:52 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
