Changeset: b921c9a1bb4a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b921c9a1bb4a
Added Files:
sql/backends/monet5/Tests/pyapi30.sql
sql/backends/monet5/Tests/pyapi30.stable.err
sql/backends/monet5/Tests/pyapi30.stable.out
Modified Files:
monetdb5/extras/pyapi/pyapi.c
Branch: iot
Log Message:
Merge with default
diffs (197 lines):
diff --git a/monetdb5/extras/pyapi/pyapi.c b/monetdb5/extras/pyapi/pyapi.c
--- a/monetdb5/extras/pyapi/pyapi.c
+++ b/monetdb5/extras/pyapi/pyapi.c
@@ -150,8 +150,10 @@ static bool enable_zerocopy_output = tru
bat->T->nil = 1;
\
}
\
}
\
+ bat->T->nonil = 1 - bat->T->nil;
\
+ } else {
\
+ bat->T->nil = 0; bat->T->nonil = 0;
\
}
\
- bat->T->nonil = 1 - bat->T->nil;
\
/*When we create a BAT a small part of memory is allocated, free it*/
\
GDKfree(bat->T->heap.base);
\
bat->T->heap.base = &data[(index_offset * ret->count) *
ret->memory_size]; \
@@ -194,8 +196,10 @@ static bool enable_zerocopy_output = tru
bat->T->nil = 1;
\
}
\
}
\
+ bat->T->nonil = 1 - bat->T->nil;
\
+ } else {
\
+ bat->T->nil = 0; bat->T->nonil = 0;
\
}
\
- bat->T->nonil = 1 - bat->T->nil;
\
/*When we create a BAT a small part of memory is allocated, free it*/
\
GDKfree(bat->T->heap.base);
\
bat->T->heap.base = &data[(index_offset * ret->count) *
ret->memory_size]; \
@@ -372,7 +376,8 @@ Array of type %s no copying will be need
goto wrapup;
\
}
\
bat->T->nonil = 1 - bat->T->nil;
\
- BATsetcount(bat, (BUN) ret->count);
\
+ if (!mask) { bat->T->nil = 0; bat->T->nonil = 0; }
\
+ BATsetcount(bat, (BUN) ret->count);
\
BATsettrivprop(bat);
\
}
\
}
diff --git a/sql/backends/monet5/Tests/pyapi30.sql
b/sql/backends/monet5/Tests/pyapi30.sql
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/pyapi30.sql
@@ -0,0 +1,16 @@
+
+# test returning of numpy.nan values
+
+START TRANSACTION;
+
+CREATE FUNCTION pyapi32() RETURNS TABLE(i INTEGER, j DOUBLE) LANGUAGE PYTHON {
+ return {'i': numpy.nan, 'j': numpy.nan }
+};
+
+SELECT * FROM pyapi32();
+SELECT * FROM pyapi32() WHERE i IS NULL;
+SELECT * FROM pyapi32() WHERE j IS NULL;
+
+DROP FUNCTION pyapi32;
+
+ROLLBACK;
diff --git a/sql/backends/monet5/Tests/pyapi30.stable.err
b/sql/backends/monet5/Tests/pyapi30.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/pyapi30.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'pyapi30` in directory 'sql/backends/monet5` itself:
+
+
+# 17:27:11 >
+# 17:27:11 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33363" "--set"
"mapi_usock=/var/tmp/mtest-90622/.s.monetdb.33363" "--set" "monet_prompt="
"--forcemito" "--dbpath=/tmp/fuckit/var/MonetDB/mTests_sql_backends_monet5"
"--set" "embedded_r=yes" "--set" "embedded_py=true"
+# 17:27:11 >
+
+# builtin opt gdk_dbpath = /tmp/fuckit/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 = 33363
+# cmdline opt mapi_usock = /var/tmp/mtest-90622/.s.monetdb.33363
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath = /tmp/fuckit/var/MonetDB/mTests_sql_backends_monet5
+# cmdline opt embedded_r = yes
+# cmdline opt embedded_py = true
+# cmdline opt gdk_debug = 536870922
+
+# 17:27:12 >
+# 17:27:12 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-90622" "--port=33363"
+# 17:27:12 >
+
+
+# 17:27:12 >
+# 17:27:12 > "Done."
+# 17:27:12 >
+
diff --git a/sql/backends/monet5/Tests/pyapi30.stable.out
b/sql/backends/monet5/Tests/pyapi30.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/pyapi30.stable.out
@@ -0,0 +1,93 @@
+stdout of test 'pyapi30` in directory 'sql/backends/monet5` itself:
+
+
+# 17:27:11 >
+# 17:27:11 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33363" "--set"
"mapi_usock=/var/tmp/mtest-90622/.s.monetdb.33363" "--set" "monet_prompt="
"--forcemito" "--dbpath=/tmp/fuckit/var/MonetDB/mTests_sql_backends_monet5"
"--set" "embedded_r=yes" "--set" "embedded_py=true"
+# 17:27:11 >
+
+# MonetDB 5 server v11.24.0
+# This is an unreleased version
+# Serving database 'mTests_sql_backends_monet5', using 4 threads
+# Compiled for x86_64-apple-darwin15.5.0/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 16.000 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2016 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://dakar.da.cwi.nl:33363/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-90622/.s.monetdb.33363
+# MonetDB/SQL module loaded
+# MonetDB/Python module loaded
+# MonetDB/R 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: 24_zorder.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_gsl.sql
+# loading sql script: 46_profiler.sql
+# loading sql script: 51_sys_schema_extension.sql
+# loading sql script: 72_fits.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
+
+# 17:27:12 >
+# 17:27:12 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-90622" "--port=33363"
+# 17:27:12 >
+
+#START TRANSACTION;
+#CREATE TABLE mytable(a DOUBLE, d int);
+#CREATE LOADER myfunc() LANGUAGE PYTHON {
+# _emit.emit({'a':42,'d':1})
+#};
+#SELECT * FROM pyapi32();
+% ., . # table_name
+% i, j # name
+% int, double # type
+% 1, 24 # length
+[ NULL, NULL ]
+#SELECT * FROM pyapi32() WHERE i IS NULL;
+% ., . # table_name
+% i, j # name
+% int, double # type
+% 1, 24 # length
+[ NULL, NULL ]
+#SELECT * FROM pyapi32() WHERE j IS NULL;
+% ., . # table_name
+% i, j # name
+% int, double # type
+% 1, 24 # length
+[ NULL, NULL ]
+#DROP FUNCTION pyapi32;
+#ROLLBACK;
+
+# 17:27:12 >
+# 17:27:12 > "Done."
+# 17:27:12 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
