Changeset: 8827543d9c36 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8827543d9c36
Added Files:
sql/backends/monet5/UDF/capi/Tests/capi11.sql
sql/backends/monet5/UDF/capi/Tests/capi11.stable.err
sql/backends/monet5/UDF/capi/Tests/capi11.stable.out
Modified Files:
sql/backends/monet5/UDF/capi/Tests/capi10.sql
sql/backends/monet5/UDF/capi/capi.c
sql/backends/monet5/UDF/capi/cheader.h
Branch: jitudf
Log Message:
Decimals.
diffs (truncated from 331 to 300 lines):
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi10.sql
b/sql/backends/monet5/UDF/capi/Tests/capi10.sql
--- a/sql/backends/monet5/UDF/capi/Tests/capi10.sql
+++ b/sql/backends/monet5/UDF/capi/Tests/capi10.sql
@@ -1,5 +1,5 @@
-# test other SQL types
+# test blob type
START TRANSACTION;
@@ -29,13 +29,15 @@ INSERT INTO blobs VALUES (BLOB '00FFFF00
SELECT capi10(i) FROM blobs;
DROP FUNCTION capi10;
-DROP TABLE blobs;
-
-
-# decimal
-# uuid
-
-# json
-
+# attempt to modify input of blobs
+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.data[i].data && inp.data[i].size > 0) {
+ ((char*)inp.data[i].data)[0] = 'h';
+ }
+ }
+};
+SELECT capi10(i) FROM blobs;
ROLLBACK;
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi11.sql
b/sql/backends/monet5/UDF/capi/Tests/capi11.sql
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/UDF/capi/Tests/capi11.sql
@@ -0,0 +1,62 @@
+
+START TRANSACTION;
+
+# decimal
+# decimals are integer types (bit, short, int or lng)
+# each decimal type has a "scale" (supplied as double)
+# this scale is the scaling factor of the value
+# for example, the value "10.3" may be stored as "103" with scaling factor "10"
+# to convert to double: 103 / 10.0 = 10.3
+# to convert a constant back into the decimal: 10 * 10 = 100 (which is equal
to )
+
+CREATE FUNCTION capi11(inp DECIMAL) RETURNS DECIMAL(11,1) LANGUAGE C {
+ result->initialize(result, inp.count);
+ for(size_t i = 0; i < inp.count; i++) {
+ if (inp.data[i] == inp.null_value) {
+ result->data[i] = result->null_value;
+ } else {
+ result->data[i] = (inp.data[i] / inp.scale) * result->scale;
+ }
+ }
+};
+
+CREATE TABLE decimals(d DECIMAL(20,3));
+INSERT INTO decimals VALUES (10.3), (10.5), (NULL), (10.7);
+
+SELECT capi11(d) FROM decimals;
+
+DROP FUNCTION capi11;
+
+# to convert from a decimal to a double simply divide the value by the scale
+CREATE FUNCTION _dec2dbl(inp DECIMAL) RETURNS DOUBLE LANGUAGE C {
+ result->initialize(result, inp.count);
+ for(size_t i = 0; i < inp.count; i++) {
+ if (inp.data[i] == inp.null_value) {
+ result->data[i] = result->null_value;
+ } else {
+ result->data[i] = inp.data[i] / inp.scale;
+ }
+ }
+};
+
+SELECT _dec2dbl(d) FROM decimals;
+
+DROP TABLE decimals;
+DROP FUNCTION _dec2dbl;
+
+# to convert a double value to a decimal multiply by the scale
+CREATE FUNCTION _dbl2dec(inp DOUBLE) RETURNS DECIMAL LANGUAGE C {
+ result->initialize(result, inp.count);
+ for(size_t i = 0; i < inp.count; i++) {
+ result->data[i] = inp.data[i] * result->scale;
+ }
+};
+
+CREATE TABLE doubles(d DOUBLE);
+INSERT INTO doubles VALUES (10.3), (10.5), (10.7);
+
+
+SELECT _dbl2dec(d) FROM doubles;
+
+
+ROLLBACK;
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi11.stable.err
b/sql/backends/monet5/UDF/capi/Tests/capi11.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/UDF/capi/Tests/capi11.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'capi11` in directory 'sql/backends/monet5/UDF/capi` itself:
+
+
+# 11:45:23 >
+# 11:45:23 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37236" "--set"
"mapi_usock=/var/tmp/mtest-63830/.s.monetdb.37236" "--set" "monet_prompt="
"--forcemito" "--dbpath=NONE/var/MonetDB/mTests_sql_backends_monet5_UDF_capi"
+# 11:45:23 >
+
+# 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 = 37236
+# cmdline opt mapi_usock = /var/tmp/mtest-63830/.s.monetdb.37236
+# 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:45:23 >
+# 11:45:23 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-63830" "--port=37236"
+# 11:45:23 >
+
+
+# 11:45:24 >
+# 11:45:24 > "Done."
+# 11:45:24 >
+
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi11.stable.out
b/sql/backends/monet5/UDF/capi/Tests/capi11.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/UDF/capi/Tests/capi11.stable.out
@@ -0,0 +1,129 @@
+stdout of test 'capi11` in directory 'sql/backends/monet5/UDF/capi` itself:
+
+
+# 11:45:23 >
+# 11:45:23 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37236" "--set"
"mapi_usock=/var/tmp/mtest-63830/.s.monetdb.37236" "--set" "monet_prompt="
"--forcemito" "--dbpath=NONE/var/MonetDB/mTests_sql_backends_monet5_UDF_capi"
+# 11:45:23 >
+
+# 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:37236/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-63830/.s.monetdb.37236
+# 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:45:23 >
+# 11:45:23 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-63830" "--port=37236"
+# 11:45:23 >
+
+#START TRANSACTION;
+#CREATE FUNCTION capi11(inp DECIMAL) RETURNS DECIMAL(11,1) LANGUAGE C {
+# result->initialize(result, inp.count);
+# for(size_t i = 0; i < inp.count; i++) {
+# if (inp.data[i] == inp.null_value) {
+# result->data[i] = result->null_value;
+# } else {
+# result->data[i] = (inp.data[i] / inp.scale) * result->scale;
+# }
+# }
+#};
+#CREATE TABLE decimals(d DECIMAL(20,3));
+#INSERT INTO decimals VALUES (10.3), (10.5), (NULL), (10.7);
+[ 4 ]
+#SELECT capi11(d) FROM decimals;
+% sys.L2 # table_name
+% L2 # name
+% decimal # type
+% 13 # length
+[ 10.3 ]
+[ 10.5 ]
+[ NULL ]
+[ 10.7 ]
+#DROP FUNCTION capi11;
+#CREATE FUNCTION _dec2dbl(inp DECIMAL) RETURNS DOUBLE LANGUAGE C {
+# result->initialize(result, inp.count);
+# for(size_t i = 0; i < inp.count; i++) {
+# if (inp.data[i] == inp.null_value) {
+# result->data[i] = result->null_value;
+# } else {
+# result->data[i] = inp.data[i] / inp.scale;
+# }
+# }
+#};
+#SELECT _dec2dbl(d) FROM decimals;
+% sys.L2 # table_name
+% L2 # name
+% double # type
+% 24 # length
+[ 10.3 ]
+[ 10.5 ]
+[ NULL ]
+[ 10.7 ]
+#DROP TABLE decimals;
+#DROP FUNCTION _dec2dbl;
+#CREATE FUNCTION _dbl2dec(inp DOUBLE) RETURNS DECIMAL LANGUAGE C {
+# result->initialize(result, inp.count);
+# for(size_t i = 0; i < inp.count; i++) {
+# result->data[i] = inp.data[i] * result->scale;
+# }
+#};
+#CREATE TABLE doubles(d DOUBLE);
+#INSERT INTO doubles VALUES (10.3), (10.5), (10.7);
+[ 3 ]
+#SELECT _dbl2dec(d) FROM doubles;
+% sys.L2 # table_name
+% L2 # name
+% decimal # type
+% 20 # length
+[ 10.300 ]
+[ 10.500 ]
+[ 10.700 ]
+#ROLLBACK;
+
+# 11:45:24 >
+# 11:45:24 > "Done."
+# 11:45:24 >
+
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
@@ -263,6 +263,7 @@ GENERATE_BASE_HEADERS(cudf_data_blob, bl
}
\
inputs[index] = bat_data;
\
bat_data->is_null = tpe##_is_null;
\
+ bat_data->scale = argnode ? pow(10, ((sql_arg
*)argnode->data)->type.scale) : 1; \
bat_data->initialize = (void (*)(void *, size_t))tpe##_initialize;
#define GENERATE_BAT_INPUT(b, tpe)
\
@@ -292,6 +293,7 @@ GENERATE_BASE_HEADERS(cudf_data_blob, bl
}
\
outputs[index] = bat_data;
\
bat_data->is_null = tpe##_is_null;
\
+ bat_data->scale = argnode ? pow(10, ((sql_arg
*)argnode->data)->type.scale) : 1; \
bat_data->initialize = (void (*)(void *, size_t))tpe##_initialize;
#define GENERATE_BAT_OUTPUT(tpe)
\
@@ -838,6 +840,7 @@ static str CUDFeval(Client cntxt, MalBlk
}
}
// create the inputs
+ argnode = sqlfun ? sqlfun->ops->h : NULL;
for (i = pci->retc + ARG_OFFSET; i < (size_t)pci->argc; i++) {
size_t index = i - (pci->retc + ARG_OFFSET);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
