Changeset: 0bcbfacd6885 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0bcbfacd6885
Added Files:
sql/backends/monet5/Tests/factory00.stable.err
sql/backends/monet5/Tests/factory00.stable.out
sql/backends/monet5/Tests/factory03.sql
Modified Files:
monetdb5/mal/mal_interpreter.c
sql/backends/monet5/Tests/All
sql/backends/monet5/Tests/factory00.sql
sql/backends/monet5/cquery.mal
sql/backends/monet5/sql_cquery.c
Branch: trails
Log Message:
Added test for factories returning tables
diffs (truncated from 608 to 300 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
@@ -1141,7 +1141,7 @@ str runMALsequence(Client cntxt, MalBlkP
if (getInstrPtr(mb, 0)->token == FACTORYsymbol) {
shutdownFactory(cntxt, mb);
- ret= createException(MAL, "mal.interpreter",
"The factory has ended");
+ ret= createException(MAL,
"mal.interpreter",SQLSTATE(42000) "The factory has ended");
} else {
/* a fake multi-assignment */
if (env != NULL && pcicaller != NULL) {
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
@@ -98,7 +98,6 @@ cqstream00
cqstream01
cqstream02
cqstream03
-cqstream08
cfunction00
cfunction01
@@ -106,3 +105,4 @@ cfunction01
factory00
factory01
factory02
+factory03
diff --git a/sql/backends/monet5/Tests/factory00.sql
b/sql/backends/monet5/Tests/factory00.sql
--- a/sql/backends/monet5/Tests/factory00.sql
+++ b/sql/backends/monet5/Tests/factory00.sql
@@ -29,7 +29,7 @@ SELECT factory2(); --error
CREATE FUNCTION factory3() RETURNS INT BEGIN
DECLARE a INT;
SET a = 0;
- WHILE a < 4 DO
+ WHILE a < 3 DO
SET a = a + 1;
YIELD a;
END WHILE;
diff --git a/sql/backends/monet5/Tests/factory00.stable.err
b/sql/backends/monet5/Tests/factory00.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/factory00.stable.err
@@ -0,0 +1,54 @@
+stderr of test 'factory00` in directory 'sql/backends/monet5` itself:
+
+
+# 14:39:52 >
+# 14:39:52 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37491" "--set"
"mapi_usock=/var/tmp/mtest-14113/.s.monetdb.37491" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/ferreira/MonetDB-trails/BUILD/var/MonetDB/mTests_sql_backends_monet5"
+# 14:39:52 >
+
+# 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 = 37491
+# cmdline opt mapi_usock = /var/tmp/mtest-14113/.s.monetdb.37491
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/ferreira/MonetDB-trails/BUILD/var/MonetDB/mTests_sql_backends_monet5
+# cmdline opt gdk_debug = 536870922
+
+# 14:39:52 >
+# 14:39:52 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-14113" "--port=37491"
+# 14:39:52 >
+
+MAPI = (monetdb) /var/tmp/mtest-14113/.s.monetdb.37491
+QUERY = SELECT factory1(); --error
+
+CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-14113/.s.monetdb.37491
+QUERY = SELECT factory2(); --error
+
+CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-14113/.s.monetdb.37491
+QUERY = SELECT factory3(); --error
+
+CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-14113/.s.monetdb.37491
+QUERY = SELECT factory4(); --error
+
+CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-14113/.s.monetdb.37491
+QUERY = SELECT factory5(); --error
+
+CODE = 42000
+
+# 14:39:53 >
+# 14:39:53 > "Done."
+# 14:39:53 >
+
diff --git a/sql/backends/monet5/Tests/factory00.stable.out
b/sql/backends/monet5/Tests/factory00.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/factory00.stable.out
@@ -0,0 +1,208 @@
+stdout of test 'factory00` in directory 'sql/backends/monet5` itself:
+
+
+# 14:39:52 >
+# 14:39:52 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37491" "--set"
"mapi_usock=/var/tmp/mtest-14113/.s.monetdb.37491" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/ferreira/MonetDB-trails/BUILD/var/MonetDB/mTests_sql_backends_monet5"
+# 14:39:52 >
+
+# 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.499 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:37491/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-14113/.s.monetdb.37491
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/Timetrails 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_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
+
+# 14:39:52 >
+# 14:39:52 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-14113" "--port=37491"
+# 14:39:52 >
+
+#CREATE FUNCTION factory1() RETURNS INT BEGIN
+# YIELD 1;
+# YIELD 2;
+# YIELD 3;
+#END;
+#SELECT factory1();
+% .L2 # table_name
+% L2 # name
+% int # type
+% 1 # length
+[ 1 ]
+#SELECT factory1();
+% .L2 # table_name
+% L2 # name
+% int # type
+% 1 # length
+[ 2 ]
+#SELECT factory1();
+% .L2 # table_name
+% L2 # name
+% int # type
+% 1 # length
+[ 3 ]
+#CREATE FUNCTION factory2() RETURNS INT BEGIN
+# DECLARE a INT;
+# SET a = 1;
+# YIELD a;
+# SET a = a + 1;
+# YIELD a;
+# SET a = a + 1;
+# YIELD a;
+#END;
+#SELECT factory2();
+% .L2 # table_name
+% L2 # name
+% int # type
+% 1 # length
+[ 1 ]
+#SELECT factory2();
+% .L2 # table_name
+% L2 # name
+% int # type
+% 1 # length
+[ 2 ]
+#SELECT factory2();
+% .L2 # table_name
+% L2 # name
+% int # type
+% 1 # length
+[ 3 ]
+#CREATE FUNCTION factory3() RETURNS INT BEGIN
+# DECLARE a INT;
+# SET a = 0;
+# WHILE a < 3 DO
+# SET a = a + 1;
+# YIELD a;
+# END WHILE;
+#END;
+#SELECT factory3();
+% .L2 # table_name
+% L2 # name
+% int # type
+% 1 # length
+[ 1 ]
+#SELECT factory3();
+% .L2 # table_name
+% L2 # name
+% int # type
+% 1 # length
+[ 2 ]
+#SELECT factory3();
+% .L2 # table_name
+% L2 # name
+% int # type
+% 1 # length
+[ 3 ]
+#CREATE FUNCTION factory4() RETURNS INT BEGIN
+# DECLARE a INT;
+# SET a = 1;
+# WHILE a < 4 DO
+# YIELD a;
+# SET a = a + 1;
+# END WHILE;
+#END;
+#SELECT factory4();
+% .L2 # table_name
+% L2 # name
+% int # type
+% 1 # length
+[ 1 ]
+#SELECT factory4();
+% .L2 # table_name
+% L2 # name
+% int # type
+% 1 # length
+[ 2 ]
+#SELECT factory4();
+% .L2 # table_name
+% L2 # name
+% int # type
+% 1 # length
+[ 3 ]
+#CREATE FUNCTION factory5() RETURNS INT BEGIN
+# DECLARE a INT;
+# SET a = 0;
+# WHILE a < 1 DO
+# SET a = a + 1;
+# END WHILE;
+# WHILE a < 4 DO
+# YIELD a;
+# SET a = a + 1;
+# END WHILE;
+#END;
+#SELECT factory5();
+% .L2 # table_name
+% L2 # name
+% int # type
+% 1 # length
+[ 1 ]
+#SELECT factory5();
+% .L2 # table_name
+% L2 # name
+% int # type
+% 1 # length
+[ 2 ]
+#SELECT factory5();
+% .L2 # table_name
+% L2 # name
+% int # type
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
