Changeset: 2d9061addec5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2d9061addec5
Added Files:
sql/backends/monet5/UDF/capi/Tests/capi15.sql
sql/backends/monet5/UDF/capi/Tests/capi15.stable.err
sql/backends/monet5/UDF/capi/Tests/capi15.stable.out
sql/backends/monet5/UDF/capi/Tests/capi16.sql
sql/backends/monet5/UDF/capi/Tests/capi16.stable.err
sql/backends/monet5/UDF/capi/Tests/capi16.stable.out
sql/backends/monet5/UDF/capi/Tests/capi17.sql
sql/backends/monet5/UDF/capi/Tests/capi17.stable.err
sql/backends/monet5/UDF/capi/Tests/capi17.stable.out
sql/backends/monet5/UDF/capi/Tests/capi18.sql
sql/backends/monet5/UDF/capi/Tests/capi18.stable.err
sql/backends/monet5/UDF/capi/Tests/capi18.stable.out
Modified Files:
debian/fix-deb.sh
sql/backends/monet5/UDF/capi/Tests/All
sql/backends/monet5/UDF/capi/capi.c
sql/backends/monet5/UDF/capi/cheader.h
Branch: default
Log Message:
Merge with Mar2018 branch.
diffs (truncated from 1188 to 300 lines):
diff --git a/debian/fix-deb.sh b/debian/fix-deb.sh
--- a/debian/fix-deb.sh
+++ b/debian/fix-deb.sh
@@ -35,7 +35,7 @@ 1)
esac
case $SUITE in
-wheezy | precise | trusty)
+wheezy | trusty)
# fix control file because these systems don't have liblas and a
# too old version of libgeos
sed -i -e 's/, libgeos-dev[^,]*//;s/, liblas-c-dev[^,]*//' \
@@ -47,7 +47,7 @@ wheezy | precise | trusty)
esac
case $SUITE in
-wheezy | jessie | precise | trusty | wily)
+wheezy | jessie | trusty | wily)
# Xenial Xerus (and presumably newer releases) uses php-cli,
# all others still have php5-cli and don't have php*-sockets
sed -i 's/php-cli/php5-cli/;s/, *php-sockets//' debian/control
@@ -55,11 +55,15 @@ wheezy | jessie | precise | trusty | wil
esac
case $SUITE in
-wheezy | precise)
+wheezy)
# numpy is too old
sed -i -e 's/, python-dev[^,]*//;s/, python-numpy[^,]*//' \
-e '/^Package:.*monetdb-python2/,/^$/d' debian/control
sed -i '/pyintegration=yes/s/yes/no/' debian/rules
rm debian/monetdb-python2.install
;;
+trusty)
+ # the trusty linker produces unresolved references to openSSL functions
+ sed -i '/openssl_LIBS/s/WIN32\?//' clients/mapilib/Makefile.ag
+ ;;
esac
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
@@ -14,4 +14,6 @@ NOT_WIN32?capi11
NOT_WIN32?capi12
NOT_WIN32?capi13
NOT_WIN32?capi14
-
+NOT_WIN32?capi15
+NOT_WIN32?capi16
+NOT_WIN32?capi17
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi15.sql
b/sql/backends/monet5/UDF/capi/Tests/capi15.sql
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/UDF/capi/Tests/capi15.sql
@@ -0,0 +1,19 @@
+
+START TRANSACTION;
+
+CREATE FUNCTION capi16(i INTEGER, j STRING, k BLOB, l DATE, m TIMESTAMP, n
TIME)
+RETURNS INTEGER
+LANGUAGE C {
+ result->initialize(result, i.count);
+ for(size_t it = 0; it < i.count; it++) {
+ result->data[it] = i.data[it] * 2;
+ }
+};
+
+CREATE TABLE capi16table(i INTEGER, j STRING, k BLOB, l DATE, m TIMESTAMP, n
TIME);
+SELECT i, capi16(i, j, k, l, m, n) FROM capi16table;
+
+DROP TABLE capi16table;
+DROP FUNCTION capi16;
+
+ROLLBACK;
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi15.stable.err
b/sql/backends/monet5/UDF/capi/Tests/capi15.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/UDF/capi/Tests/capi15.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'capi15` in directory 'sql/backends/monet5/UDF/capi` itself:
+
+
+# 14:47:44 >
+# 14:47:44 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32682" "--set"
"mapi_usock=/var/tmp/mtest-72472/.s.monetdb.32682" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/Users/myth/opt/var/MonetDB/mTests_sql_backends_monet5_UDF_capi"
"--set" "embedded_c=true"
+# 14:47:44 >
+
+# 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 = 32682
+# cmdline opt mapi_usock = /var/tmp/mtest-72472/.s.monetdb.32682
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/Users/myth/opt/var/MonetDB/mTests_sql_backends_monet5_UDF_capi
+# cmdline opt embedded_c = true
+# cmdline opt gdk_debug = 553648138
+
+# 14:47:44 >
+# 14:47:44 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-72472" "--port=32682"
+# 14:47:44 >
+
+
+# 14:47:45 >
+# 14:47:45 > "Done."
+# 14:47:45 >
+
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi15.stable.out
b/sql/backends/monet5/UDF/capi/Tests/capi15.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/UDF/capi/Tests/capi15.stable.out
@@ -0,0 +1,85 @@
+stdout of test 'capi15` in directory 'sql/backends/monet5/UDF/capi` itself:
+
+
+# 14:47:44 >
+# 14:47:44 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32682" "--set"
"mapi_usock=/var/tmp/mtest-72472/.s.monetdb.32682" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/Users/myth/opt/var/MonetDB/mTests_sql_backends_monet5_UDF_capi"
"--set" "embedded_c=true"
+# 14:47:44 >
+
+# MonetDB 5 server v11.29.4
+# 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 - 2018 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://dhcp-30.eduroam.cwi.nl:32682/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-72472/.s.monetdb.32682
+# 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: 21_dependency_views.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:47:44 >
+# 14:47:44 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-72472" "--port=32682"
+# 14:47:44 >
+
+#START TRANSACTION;
+#CREATE FUNCTION capi16(i INTEGER, j STRING, k BLOB, l DATE, m TIMESTAMP, n
TIME)
+#RETURNS INTEGER
+#LANGUAGE C {
+# result->initialize(result, i.count);
+# for(size_t it = 0; it < i.count; it++) {
+# result->data[it] = i.data[it] * 2;
+# }
+#};
+#CREATE TABLE capi16table(i INTEGER, j STRING, k BLOB, l DATE, m TIMESTAMP, n
TIME);
+#SELECT i, capi16(i, j, k, l, m, n) FROM capi16table;
+% sys.capi16table, sys.L3 # table_name
+% i, L3 # name
+% int, int # type
+% 1, 1 # length
+#DROP TABLE capi16table;
+#DROP FUNCTION capi16;
+#ROLLBACK;
+
+# 14:47:45 >
+# 14:47:45 > "Done."
+# 14:47:45 >
+
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi16.sql
b/sql/backends/monet5/UDF/capi/Tests/capi16.sql
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/UDF/capi/Tests/capi16.sql
@@ -0,0 +1,112 @@
+
+START TRANSACTION;
+CREATE FUNCTION string_reverse(input STRING) RETURNS STRING
+LANGUAGE C {
+#include <string.h>
+ size_t i, j;
+ result->initialize(result, input.count);
+ for(i = 0; i < input.count; i++) {
+ char* input_string = input.data[i];
+ size_t len = strlen(input_string);
+ result->data[i] = malloc(len + 1);
+ for(j = 0; j < len; j++) {
+ result->data[i][j] = input_string[len - j - 1];
+ }
+ result->data[i][len] = '\0';
+ }
+};
+
+SELECT 'hello', string_reverse('hello');
+
+
+CREATE FUNCTION capi10(inp BLOB) RETURNS BLOB LANGUAGE C {
+ size_t i;
+ result->initialize(result, inp.count);
+ for(i = 0; i < inp.count; i++) {
+ if (inp.is_null(inp.data[i])) {
+ result->data[i] = result->null_value;
+ } else {
+ result->data[i].data = malloc(inp.data[i].size);
+ memcpy(result->data[i].data, inp.data[i].data, inp.data[i].size);
+ result->data[i].size = inp.data[i].size;
+ }
+ }
+};
+
+SELECT BLOB '00FFFF00', capi10(BLOB '00FFFF00');
+
+
+CREATE FUNCTION capi00(inp INTEGER) RETURNS INTEGER LANGUAGE C {
+ size_t i;
+ result->initialize(result, inp.count);
+ for(i = 0; i < inp.count; i++) {
+ result->data[i] = inp.data[i] * 2;
+ }
+};
+
+SELECT 1, capi00(1);
+
+CREATE FUNCTION capi02_increment_year(d DATE) RETURNS DATE
+language C
+{
+ size_t i;
+ result->initialize(result, d.count);
+ for(i = 0; i < result->count; i++) {
+ if (d.is_null(d.data[i])) {
+ result->data[i] = result->null_value;
+ } else {
+ result->data[i].year = d.data[i].year + 1;
+ result->data[i].month = d.data[i].month;
+ result->data[i].day = d.data[i].day;
+ }
+ }
+};
+
+
+SELECT capi02_increment_year('1992-09-20');
+
+
+CREATE FUNCTION capi02_randomize_time(d TIME) RETURNS TIME
+language C
+{
+ size_t i;
+ result->initialize(result, d.count);
+ for(i = 0; i < result->count; i++) {
+ if (d.is_null(d.data[i])) {
+ result->data[i] = result->null_value;
+ } else {
+ result->data[i].hours = (i + 1234) % 24;
+ result->data[i].minutes = (i + 1234) % 60;
+ result->data[i].seconds = (i + 1234) % 60;
+ result->data[i].ms = (i + 1234) % 1000;
+ }
+ }
+};
+
+SELECT capi02_randomize_time('03:03:02.0101');
+
+
+CREATE FUNCTION capi02_increment_timestamp(d TIMESTAMP) RETURNS TIMESTAMP
+language C
+{
+ size_t i;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
