Changeset: 579afc3ecc82 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=579afc3ecc82
Added Files:
sql/backends/monet5/UDF/capi/Tests/capi06.sql
sql/backends/monet5/UDF/capi/Tests/capi06.stable.err
sql/backends/monet5/UDF/capi/Tests/capi06.stable.out
sql/backends/monet5/UDF/capi/Tests/capi07.sql
sql/backends/monet5/UDF/capi/Tests/capi07.stable.err
sql/backends/monet5/UDF/capi/Tests/capi07.stable.out
Modified Files:
sql/backends/monet5/UDF/capi/Tests/All
sql/backends/monet5/UDF/capi/capi.c
Branch: jitudf
Log Message:
Correctly support aggregates and add testcases.
diffs (truncated from 331 to 300 lines):
diff --git a/sql/backends/monet5/UDF/capi/Tests/All
b/sql/backends/monet5/UDF/capi/Tests/All
--- a/sql/backends/monet5/UDF/capi/Tests/All
+++ b/sql/backends/monet5/UDF/capi/Tests/All
@@ -5,3 +5,5 @@ capi02
capi03
capi04
capi05
+capi06
+capi07
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi06.sql
b/sql/backends/monet5/UDF/capi/Tests/capi06.sql
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/UDF/capi/Tests/capi06.sql
@@ -0,0 +1,24 @@
+
+# test CPP UDFs
+
+START TRANSACTION;
+
+CREATE FUNCTION capi06(inp INTEGER) RETURNS INTEGER LANGUAGE CPP {
+#include <vector>
+ std::vector<int> elements;
+ for(size_t i = 0; i < inp.count; i++) {
+ elements.push_back(inp.data[i]);
+ }
+ std::sort(elements.begin(), elements.end());
+ result->initialize(result, inp.count);
+ for(size_t i = 0; i < inp.count; i++) {
+ result->data[i] = elements[i];
+ }
+};
+
+CREATE TABLE integers(i INTEGER);
+INSERT INTO integers VALUES (3), (4), (1), (2), (5);
+
+SELECT capi06(i) FROM integers;
+
+ROLLBACK;
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi06.stable.err
b/sql/backends/monet5/UDF/capi/Tests/capi06.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/UDF/capi/Tests/capi06.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'capi06` in directory 'sql/backends/monet5/UDF/capi` itself:
+
+
+# 14:53:38 >
+# 14:53:38 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38582" "--set"
"mapi_usock=/var/tmp/mtest-20999/.s.monetdb.38582" "--set" "monet_prompt="
"--forcemito" "--dbpath=NONE/var/MonetDB/mTests_sql_backends_monet5_UDF_capi"
+# 14:53:38 >
+
+# builtin opt gdk_dbpath = /Users/myth/opt/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 = 38582
+# cmdline opt mapi_usock = /var/tmp/mtest-20999/.s.monetdb.38582
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/Users/myth/opt/mTests/sql/backends/monet5/UDF/capi/NONE/var/MonetDB/mTests_sql_backends_monet5_UDF_capi
+# cmdline opt gdk_debug = 536870922
+
+# 14:53:38 >
+# 14:53:38 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-20999" "--port=38582"
+# 14:53:38 >
+
+
+# 14:53:39 >
+# 14:53:39 > "Done."
+# 14:53:39 >
+
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi06.stable.out
b/sql/backends/monet5/UDF/capi/Tests/capi06.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/UDF/capi/Tests/capi06.stable.out
@@ -0,0 +1,93 @@
+stdout of test 'capi06` in directory 'sql/backends/monet5/UDF/capi` itself:
+
+
+# 14:53:38 >
+# 14:53:38 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38582" "--set"
"mapi_usock=/var/tmp/mtest-20999/.s.monetdb.38582" "--set" "monet_prompt="
"--forcemito" "--dbpath=NONE/var/MonetDB/mTests_sql_backends_monet5_UDF_capi"
+# 14:53:38 >
+
+# MonetDB 5 server v11.28.0
+# This is an unreleased version
+# Serving database 'mTests_sql_backends_monet5_UDF_capi', using 4 threads
+# Compiled for x86_64-apple-darwin15.6.0/64bit with 128bit integers
+# Found 8.000 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-21.eduroam.cwi.nl:38582/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-20999/.s.monetdb.38582
+# MonetDB/SQL 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_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: 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_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 80_udf_hge.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 90_generator_hge.sql
+# loading sql script: 99_system.sql
+
+# 14:53:38 >
+# 14:53:38 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-20999" "--port=38582"
+# 14:53:38 >
+
+#START TRANSACTION;
+#CREATE FUNCTION capi06(inp INTEGER) RETURNS INTEGER LANGUAGE CPP {
+##include <vector>
+# std::vector<int> elements;
+# for(size_t i = 0; i < inp.count; i++) {
+# elements.push_back(inp.data[i]);
+# }
+# std::sort(elements.begin(), elements.end());
+# result->initialize(result, inp.count);
+# for(size_t i = 0; i < inp.count; i++) {
+# result->data[i] = elements[i];
+# }
+#};
+#CREATE TABLE integers(i INTEGER);
+#INSERT INTO integers VALUES (3), (4), (1), (2), (5);
+[ 5 ]
+#SELECT capi06(i) FROM integers;
+% sys.L2 # table_name
+% L2 # name
+% int # type
+% 1 # length
+[ 1 ]
+[ 2 ]
+[ 3 ]
+[ 4 ]
+[ 5 ]
+#ROLLBACK;
+
+# 14:53:39 >
+# 14:53:39 > "Done."
+# 14:53:39 >
+
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi07.sql
b/sql/backends/monet5/UDF/capi/Tests/capi07.sql
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/UDF/capi/Tests/capi07.sql
@@ -0,0 +1,19 @@
+
+
+START TRANSACTION;
+
+CREATE AGGREGATE capi06(inp INTEGER) RETURNS BIGINT LANGUAGE C {
+ lng sum = 0;
+ for(size_t i = 0; i < inp.count; i++) {
+ sum += inp.data[i];
+ }
+ result->initialize(result, 1);
+ result->data[0] = sum;
+};
+
+CREATE TABLE integers(i INTEGER);
+INSERT INTO integers VALUES (3), (4), (1), (2), (5), (6);
+
+SELECT capi06(i) FROM integers;
+
+ROLLBACK;
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi07.stable.err
b/sql/backends/monet5/UDF/capi/Tests/capi07.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/UDF/capi/Tests/capi07.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'capi07` in directory 'sql/backends/monet5/UDF/capi` itself:
+
+
+# 14:50:08 >
+# 14:50:08 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31154" "--set"
"mapi_usock=/var/tmp/mtest-15870/.s.monetdb.31154" "--set" "monet_prompt="
"--forcemito" "--dbpath=NONE/var/MonetDB/mTests_sql_backends_monet5_UDF_capi"
+# 14:50:08 >
+
+# builtin opt gdk_dbpath = /Users/myth/opt/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 = 31154
+# cmdline opt mapi_usock = /var/tmp/mtest-15870/.s.monetdb.31154
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/Users/myth/opt/mTests/sql/backends/monet5/UDF/capi/NONE/var/MonetDB/mTests_sql_backends_monet5_UDF_capi
+# cmdline opt gdk_debug = 536870922
+
+# 14:50:08 >
+# 14:50:08 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-15870" "--port=31154"
+# 14:50:08 >
+
+
+# 14:50:08 >
+# 14:50:08 > "Done."
+# 14:50:08 >
+
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi07.stable.out
b/sql/backends/monet5/UDF/capi/Tests/capi07.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/UDF/capi/Tests/capi07.stable.out
@@ -0,0 +1,49 @@
+stdout of test 'capi07` in directory 'sql/backends/monet5/UDF/capi` itself:
+
+
+# 14:50:08 >
+# 14:50:08 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31154" "--set"
"mapi_usock=/var/tmp/mtest-15870/.s.monetdb.31154" "--set" "monet_prompt="
"--forcemito" "--dbpath=NONE/var/MonetDB/mTests_sql_backends_monet5_UDF_capi"
+# 14:50:08 >
+
+# MonetDB 5 server v11.28.0
+# This is an unreleased version
+# Serving database 'mTests_sql_backends_monet5_UDF_capi', using 4 threads
+# Compiled for x86_64-apple-darwin15.6.0/64bit with 128bit integers
+# Found 8.000 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-21.eduroam.cwi.nl:31154/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-15870/.s.monetdb.31154
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 14:50:08 >
+# 14:50:08 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-15870" "--port=31154"
+# 14:50:08 >
+
+#START TRANSACTION;
+#CREATE AGGREGATE capi06(inp INTEGER) RETURNS BIGINT LANGUAGE C {
+# lng sum = 0;
+# for(size_t i = 0; i < inp.count; i++) {
+# sum += inp.data[i];
+# }
+# result->initialize(result, 1);
+# result->data[0] = sum;
+#};
+#CREATE TABLE integers(i INTEGER);
+#INSERT INTO integers VALUES (3), (4), (1), (2), (5), (6);
+[ 6 ]
+#SELECT capi06(i) FROM integers;
+% sys.L4 # table_name
+% L3 # name
+% bigint # type
+% 2 # length
+[ 21 ]
+#ROLLBACK;
+
+# 14:50:08 >
+# 14:50:08 > "Done."
+# 14:50:08 >
+
diff --git a/sql/backends/monet5/UDF/capi/capi.c
b/sql/backends/monet5/UDF/capi/capi.c
--- a/sql/backends/monet5/UDF/capi/capi.c
+++ b/sql/backends/monet5/UDF/capi/capi.c
@@ -521,7 +521,10 @@ static str CUDFeval(Client cntxt, MalBlk
}
// create the actual function
- ATTEMPT_TO_WRITE_TO_FILE(f, "\nextern \"C\" char* ");
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
