Changeset: d07e47be4ea4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d07e47be4ea4
Added Files:
sql/backends/monet5/Tests/pyapi23.sql
sql/backends/monet5/Tests/pyapi23.stable.err
sql/backends/monet5/Tests/pyapi23.stable.out
sql/backends/monet5/Tests/pyapi24.sql
sql/backends/monet5/Tests/pyapi24.stable.err
sql/backends/monet5/Tests/pyapi24.stable.out
Modified Files:
sql/backends/monet5/Tests/All
Branch: pyapi
Log Message:
Added varargs testcase.
diffs (truncated from 411 to 300 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
@@ -21,6 +21,8 @@ HAVE_LIBPY?pyapi19
HAVE_LIBPY?pyapi20
HAVE_LIBPY?pyapi21
HAVE_LIBPY?pyapi22
+HAVE_LIBPY?pyapi23
+HAVE_LIBPY?pyapi24
#HAVE_LIBR?rapi00
#HAVE_LIBR?rapi01
diff --git a/sql/backends/monet5/Tests/pyapi23.sql
b/sql/backends/monet5/Tests/pyapi23.sql
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/pyapi23.sql
@@ -0,0 +1,34 @@
+
+START TRANSACTION;
+
+CREATE AGGREGATE pyapi23(val integer) RETURNS integer LANGUAGE P {
+ if 'aggr_group' in locals():
+ unique = numpy.unique(aggr_group)
+ x = numpy.zeros(shape=(unique.size))
+ for i in range(0,unique.size):
+ x[i] = numpy.sum(val[aggr_group==unique[i]])
+ return(x)
+ else:
+ return(numpy.sum(val))
+};
+
+
+CREATE FUNCTION pyapi23datagen() RETURNS TABLE (g int, n int) LANGUAGE PYTHON {
+ numpy.random.seed(42)
+ result = dict()
+ result['g'] = numpy.repeat(numpy.arange(2), 10)
+ numpy.random.shuffle(result['g'])
+ result['n'] = numpy.repeat(10, len(result['g']))
+ return result
+};
+
+
+CREATE TABLE pyapi23table as select * from pyapi23datagen() with data;
+
+# works
+select g, pyapi23(n) from pyapi23datagen() group by g;
+# doesn't work
+select g, pyapi23(n) from pyapi23table group by g;
+
+
+ROLLBACK;
diff --git a/sql/backends/monet5/Tests/pyapi23.stable.err
b/sql/backends/monet5/Tests/pyapi23.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/pyapi23.stable.err
@@ -0,0 +1,38 @@
+stderr of test 'pyapi23` in directory 'sql/backends/monet5` itself:
+
+
+# 15:43:46 >
+# 15:43:46 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30334" "--set"
"mapi_usock=/var/tmp/mtest-16024/.s.monetdb.30334" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch2/raasveld/build/var/MonetDB/mTests_sql_backends_monet5"
"--set" "mal_listing=0" "--set" "embedded_r=true" "--set" "embedded_py=true"
+# 15:43:46 >
+
+# builtin opt gdk_dbpath =
/export/scratch2/raasveld/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 = 30334
+# cmdline opt mapi_usock = /var/tmp/mtest-16024/.s.monetdb.30334
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/export/scratch2/raasveld/build/var/MonetDB/mTests_sql_backends_monet5
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = true
+# cmdline opt embedded_py = true
+# cmdline opt gdk_debug = 536870922
+
+# 15:43:46 >
+# 15:43:46 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-16024" "--port=30334"
+# 15:43:46 >
+
+
+# 15:43:47 >
+# 15:43:47 > "Done."
+# 15:43:47 >
+
diff --git a/sql/backends/monet5/Tests/pyapi23.stable.out
b/sql/backends/monet5/Tests/pyapi23.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/pyapi23.stable.out
@@ -0,0 +1,70 @@
+stdout of test 'pyapi23` in directory 'sql/backends/monet5` itself:
+
+
+# 15:43:46 >
+# 15:43:46 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30334" "--set"
"mapi_usock=/var/tmp/mtest-16024/.s.monetdb.30334" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch2/raasveld/build/var/MonetDB/mTests_sql_backends_monet5"
"--set" "mal_listing=0" "--set" "embedded_r=true" "--set" "embedded_py=true"
+# 15:43:46 >
+
+# MonetDB 5 server v11.22.0
+# This is an unreleased version
+# Serving database 'mTests_sql_backends_monet5', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 15.590 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
+# Listening for connection requests on mapi:monetdb://lyon.ins.cwi.nl:30334/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-16024/.s.monetdb.30334
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/Python module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 15:43:46 >
+# 15:43:46 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-16024" "--port=30334"
+# 15:43:46 >
+
+#START TRANSACTION;
+#CREATE AGGREGATE pyapi23(val integer) RETURNS integer LANGUAGE P {
+# if 'aggr_group' in locals():
+# unique = numpy.unique(aggr_group)
+# x = numpy.zeros(shape=(unique.size))
+# for i in range(0,unique.size):
+# x[i] = numpy.sum(val[aggr_group==unique[i]])
+# return(x)
+# else:
+# return(numpy.sum(val))
+#};
+#CREATE FUNCTION pyapi23datagen() RETURNS TABLE (g int, n int) LANGUAGE PYTHON
{
+# numpy.random.seed(42)
+# result = dict()
+# result['g'] = numpy.repeat(numpy.arange(2), 10)
+# numpy.random.shuffle(result['g'])
+# result['n'] = numpy.repeat(10, len(result['g']))
+# return result
+#};
+#CREATE TABLE pyapi23table as select * from pyapi23datagen() with data;
+#select g, pyapi23(n) from pyapi23datagen() group by g;
+% .L, .L1 # table_name
+% g, L1 # name
+% int, int # type
+% 1, 3 # length
+[ 0, 100 ]
+[ 1, 100 ]
+#select g, pyapi23(n) from pyapi23datagen() group by g;
+% .L, .L1 # table_name
+% g, L1 # name
+% int, int # type
+% 1, 3 # length
+[ 0, 100 ]
+[ 1, 100 ]
+#ROLLBACK;
+
+# 15:43:47 >
+# 15:43:47 > "Done."
+# 15:43:47 >
+
diff --git a/sql/backends/monet5/Tests/pyapi24.sql
b/sql/backends/monet5/Tests/pyapi24.sql
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/pyapi24.sql
@@ -0,0 +1,55 @@
+# Description #
+# This test case tests variable number of arguments (*) using the pyapi.
+
+START TRANSACTION;
+
+CREATE FUNCTION pyapi24(*) RETURNS integer LANGUAGE PYTHON
+{
+ sum = 0
+ for key in _columns.keys():
+ sum += numpy.sum(_columns[key])
+ return sum
+};
+
+CREATE TABLE pyapi24table(i INTEGER, j INTEGER, k INTEGER, l INTEGER, m
INTEGER);
+INSERT INTO pyapi24table VALUES (1, 2, 3, 4, 5), (1, 2, 3, 4, 5), (1, 2, 3, 4,
5), (1, 2, 3, 4, 5), (1, 2, 3, 4, 5);
+
+# different columns
+SELECT pyapi24(i) FROM pyapi24table;
+SELECT pyapi24(i,j) FROM pyapi24table;
+SELECT pyapi24(i,j,k) FROM pyapi24table;
+SELECT pyapi24(i,j,k,l) FROM pyapi24table;
+SELECT pyapi24(i,j,k,l,m) FROM pyapi24table;
+
+# use the same column over and over
+SELECT pyapi24(i,i,i,i,i) FROM pyapi24table;
+SELECT pyapi24(i,i,i,i,i,i,i,i,i,i) FROM pyapi24table;
+SELECT pyapi24(i,i,i,i,i,i,i,i,i,i,i,i,i,i,i) FROM pyapi24table;
+SELECT pyapi24(i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i) FROM pyapi24table;
+SELECT pyapi24(i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i) FROM
pyapi24table;
+#lets go a little crazy (100 columns)
+SELECT
pyapi24(i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i,i)
FROM pyapi24table;
+
+DROP FUNCTION pyapi24;
+DROP TABLE pyapi24table;
+
+#lets try to mix column types
+
+
+CREATE FUNCTION pyapi24(*) RETURNS DOUBLE LANGUAGE PYTHON
+{
+ sum = 0
+ for key in _columns.keys():
+ if _column_types[key] != 'STRING':
+ sum += numpy.sum(_columns[key])
+ else:
+ sum += 10000 * len(_columns[key]) # strings are worth more points
+ return sum
+};
+
+CREATE TABLE pyapi24table(i BOOLEAN, j TINYINT, k INTEGER, l DOUBLE, m STRING);
+INSERT INTO pyapi24table VALUES (True, 10, 1000, 100.1, 'Hello'), (True, 10,
1000, 100.1, 'Hello'), (True, 10, 1000, 100.1, 'Hello'), (True, 10, 1000,
100.1, 'Hello'), (True, 10, 1000, 100.1, 'Hello');
+
+SELECT pyapi24(i,j,k,l,m) FROM pyapi24table; #55555.5
+
+ROLLBACK;
diff --git a/sql/backends/monet5/Tests/pyapi24.stable.err
b/sql/backends/monet5/Tests/pyapi24.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/pyapi24.stable.err
@@ -0,0 +1,38 @@
+stderr of test 'pyapi24` in directory 'sql/backends/monet5` itself:
+
+
+# 15:58:33 >
+# 15:58:33 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33123" "--set"
"mapi_usock=/var/tmp/mtest-17490/.s.monetdb.33123" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch2/raasveld/build/var/MonetDB/mTests_sql_backends_monet5"
"--set" "mal_listing=0" "--set" "embedded_r=true" "--set" "embedded_py=true"
+# 15:58:33 >
+
+# builtin opt gdk_dbpath =
/export/scratch2/raasveld/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 = 33123
+# cmdline opt mapi_usock = /var/tmp/mtest-17490/.s.monetdb.33123
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/export/scratch2/raasveld/build/var/MonetDB/mTests_sql_backends_monet5
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = true
+# cmdline opt embedded_py = true
+# cmdline opt gdk_debug = 536870922
+
+# 15:58:34 >
+# 15:58:34 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17490" "--port=33123"
+# 15:58:34 >
+
+
+# 15:58:34 >
+# 15:58:34 > "Done."
+# 15:58:34 >
+
diff --git a/sql/backends/monet5/Tests/pyapi24.stable.out
b/sql/backends/monet5/Tests/pyapi24.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/pyapi24.stable.out
@@ -0,0 +1,134 @@
+stdout of test 'pyapi24` in directory 'sql/backends/monet5` itself:
+
+
+# 15:58:33 >
+# 15:58:33 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33123" "--set"
"mapi_usock=/var/tmp/mtest-17490/.s.monetdb.33123" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch2/raasveld/build/var/MonetDB/mTests_sql_backends_monet5"
"--set" "mal_listing=0" "--set" "embedded_r=true" "--set" "embedded_py=true"
+# 15:58:33 >
+
+# MonetDB 5 server v11.22.0
+# This is an unreleased version
+# Serving database 'mTests_sql_backends_monet5', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 15.590 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
+# Listening for connection requests on mapi:monetdb://lyon.ins.cwi.nl:33123/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-17490/.s.monetdb.33123
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/Python module loaded
+# MonetDB/R module loaded
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
