Changeset: d2f6194479b6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d2f6194479b6
Added Files:
sql/backends/monet5/UDF/capi/Tests/capi10.sql
sql/backends/monet5/UDF/capi/Tests/capi10.stable.err
sql/backends/monet5/UDF/capi/Tests/capi10.stable.out
Modified Files:
sql/backends/monet5/UDF/capi/Tests/capi02.sql
sql/backends/monet5/UDF/capi/capi.c
sql/backends/monet5/UDF/capi/cheader.h
Branch: jitudf
Log Message:
Blobs.
diffs (truncated from 419 to 300 lines):
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi02.sql
b/sql/backends/monet5/UDF/capi/Tests/capi02.sql
--- a/sql/backends/monet5/UDF/capi/Tests/capi02.sql
+++ b/sql/backends/monet5/UDF/capi/Tests/capi02.sql
@@ -1,6 +1,14 @@
# Dates, times, timestamps
START TRANSACTION;
+# dates
+# dates have the type
+#typedef struct {
+# unsigned char day;
+# unsigned char month;
+# int year;
+#} cudf_data_date;
+
CREATE FUNCTION capi02_increment_year(d DATE) RETURNS DATE
language C
{
@@ -25,6 +33,15 @@ DROP FUNCTION capi02_increment_year;
DROP TABLE dates;
+#time
+#time has the type:
+#typedef struct {
+# unsigned int ms;
+# unsigned char seconds;
+# unsigned char minutes;
+# unsigned char hours;
+#} cudf_data_time;
+
CREATE FUNCTION capi02_randomize_time(d TIME) RETURNS TIME
language C
{
@@ -50,6 +67,12 @@ SELECT capi02_randomize_time(i) FROM tim
DROP FUNCTION capi02_randomize_time;
DROP TABLE times;
+#timestamps
+#timestamps have the type:
+#typedef struct {
+# cudf_data_date date;
+# cudf_data_time time;
+#} cudf_data_timestamp;
CREATE FUNCTION capi02_increment_timestamp(d TIMESTAMP) RETURNS TIMESTAMP
language C
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi10.sql
b/sql/backends/monet5/UDF/capi/Tests/capi10.sql
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/UDF/capi/Tests/capi10.sql
@@ -0,0 +1,41 @@
+
+# test other SQL types
+
+START TRANSACTION;
+
+# blob
+# blobs have the type:
+#typedef struct {
+# size_t size;
+# void* data;
+#} cudf_data_blob;
+
+CREATE FUNCTION capi10(inp BLOB) RETURNS BLOB LANGUAGE C {
+ result->initialize(result, inp.count);
+ for(size_t 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;
+ }
+ }
+};
+
+CREATE TABLE blobs(i BLOB);
+INSERT INTO blobs VALUES (BLOB '00FFFF00'), (NULL), (BLOB '');
+
+SELECT capi10(i) FROM blobs;
+
+DROP FUNCTION capi10;
+DROP TABLE blobs;
+
+
+# decimal
+
+# uuid
+
+# json
+
+ROLLBACK;
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi10.stable.err
b/sql/backends/monet5/UDF/capi/Tests/capi10.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/UDF/capi/Tests/capi10.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'capi10` in directory 'sql/backends/monet5/UDF/capi` itself:
+
+
+# 11:25:01 >
+# 11:25:01 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30547" "--set"
"mapi_usock=/var/tmp/mtest-24716/.s.monetdb.30547" "--set" "monet_prompt="
"--forcemito" "--dbpath=NONE/var/MonetDB/mTests_sql_backends_monet5_UDF_capi"
+# 11:25:01 >
+
+# 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 = 30547
+# cmdline opt mapi_usock = /var/tmp/mtest-24716/.s.monetdb.30547
+# 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
+
+# 11:25:01 >
+# 11:25:01 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-24716" "--port=30547"
+# 11:25:01 >
+
+
+# 11:25:02 >
+# 11:25:02 > "Done."
+# 11:25:02 >
+
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi10.stable.out
b/sql/backends/monet5/UDF/capi/Tests/capi10.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/UDF/capi/Tests/capi10.stable.out
@@ -0,0 +1,93 @@
+stdout of test 'capi10` in directory 'sql/backends/monet5/UDF/capi` itself:
+
+
+# 11:25:01 >
+# 11:25:01 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30547" "--set"
"mapi_usock=/var/tmp/mtest-24716/.s.monetdb.30547" "--set" "monet_prompt="
"--forcemito" "--dbpath=NONE/var/MonetDB/mTests_sql_backends_monet5_UDF_capi"
+# 11:25:01 >
+
+# 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:30547/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-24716/.s.monetdb.30547
+# 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
+
+# 11:25:01 >
+# 11:25:01 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-24716" "--port=30547"
+# 11:25:01 >
+
+#START TRANSACTION;
+#CREATE FUNCTION capi10(inp BLOB) RETURNS BLOB LANGUAGE C {
+# result->initialize(result, inp.count);
+# for(size_t 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;
+# }
+# }
+#};
+#CREATE TABLE blobs(i BLOB);
+#INSERT INTO blobs VALUES (BLOB '00FFFF00'), (NULL), (BLOB '');
+[ 3 ]
+#SELECT capi10(i) FROM blobs;
+% sys.L2 # table_name
+% L2 # name
+% blob # type
+% 0 # length
+[ 00FFFF00 ]
+[ NULL ]
+[ ]
+#DROP FUNCTION capi10;
+#DROP TABLE blobs;
+#ROLLBACK;
+
+# 11:25:02 >
+# 11:25:02 > "Done."
+# 11:25:02 >
+
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
@@ -11,6 +11,7 @@
#include "cheader.text.h"
#include "mtime.h"
+#include "blob.h"
#include <setjmp.h>
#include <signal.h>
@@ -251,6 +252,7 @@ GENERATE_BASE_HEADERS(char *, str);
GENERATE_BASE_HEADERS(cudf_data_date, date);
GENERATE_BASE_HEADERS(cudf_data_time, time);
GENERATE_BASE_HEADERS(cudf_data_timestamp, timestamp);
+GENERATE_BASE_HEADERS(cudf_data_blob, blob);
#define GENERATE_BAT_INPUT_BASE(b, tpe)
\
struct cudf_data_struct_##tpe *bat_data =
\
@@ -977,6 +979,45 @@ static str CUDFeval(Client cntxt, MalBlk
data_from_timestamp(baseptr[j],
bat_data->data + j);
}
data_from_timestamp(*timestamp_nil,
&bat_data->null_value);
+ } else if (bat_type == TYPE_blob || bat_type ==
TYPE_sqlblob) {
+ BATiter li;
+ BUN p = 0, q = 0;
+ str mprotect_retval;
+ GENERATE_BAT_INPUT_BASE(input_bats[index],
blob);
+ bat_data->count = BATcount(input_bats[index]);
+ bat_data->data =
GDKmalloc(sizeof(cudf_data_blob) * bat_data->count);
+ if (!bat_data->data) {
+ msg = createException(MAL, "cudf.eval",
MAL_MALLOC_FAIL);
+ goto wrapup;
+ }
+ j = 0;
+
+ li = bat_iterator(input_bats[index]);
+ BATloop(input_bats[index], p, q)
+ {
+ blob *t = (blob *)BUNtail(li, p);
+ if (t->nitems == ~(size_t) 0) {
+ bat_data->data[j].size = 0;
+ bat_data->data[j].data = NULL;
+ } else {
+ bat_data->data[j].size =
t->nitems;
+ bat_data->data[j].data =
&t->data[0];
+ }
+ j++;
+ }
+ bat_data->null_value.size = 0;
+ bat_data->null_value.data = NULL;
+ // for blob columns, mprotect the varheap of
the BAT
+ assert(input_bats[index]->tvheap);
+ mprotect_retval = mprotect_region(
+ input_bats[index]->tvheap->base,
+ input_bats[index]->tvheap->size,
PROT_READ, ®ions);
+ if (mprotect_retval) {
+ msg = createException(MAL, "cudf.eval",
+
"Failed to mprotect region: %s",
+
mprotect_retval);
+ goto wrapup;
+ }
} else {
assert(0);
msg = createException(MAL, "cudf.eval",
"Unknown input type");
@@ -1013,6 +1054,10 @@ static str CUDFeval(Client cntxt, MalBlk
} else if (bat_type == TYPE_timestamp) {
GENERATE_BAT_OUTPUT_BASE(timestamp);
data_from_timestamp(*timestamp_nil,
&bat_data->null_value);
+ } else if (bat_type == TYPE_blob || bat_type == TYPE_sqlblob) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
