Changeset: 3266452a03de for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3266452a03de
Added Files:
sql/backends/monet5/Tests/rapi14.stable.err
sql/backends/monet5/Tests/rapi14.stable.out
Modified Files:
monetdb5/extras/rapi/rapi.c
sql/backends/monet5/Tests/rapi14.sql
Branch: Jul2015
Log Message:
fixed rapi14/03 ie use TYPE_bit for boolean not bte
(grafted from b462ae8159339c875f18fd0ae75fa25d59495c7e)
diffs (168 lines):
diff --git a/monetdb5/extras/rapi/rapi.c b/monetdb5/extras/rapi/rapi.c
--- a/monetdb5/extras/rapi/rapi.c
+++ b/monetdb5/extras/rapi/rapi.c
@@ -499,6 +499,9 @@ str RAPIeval(Client cntxt, MalBlkPtr mb,
varname = PROTECT(Rf_install(args[i]));
switch (ATOMstorage(getColumnType(getArgType(mb,pci,i)))) {
+ case TYPE_bit:
+ BAT_TO_INTSXP(b, bit, varvalue);
+ break;
case TYPE_bte:
BAT_TO_INTSXP(b, bte, varvalue);
break;
@@ -650,6 +653,7 @@ str RAPIeval(Client cntxt, MalBlkPtr mb,
i,
rtypename(TYPEOF(ret_col)));
goto wrapup;
}
+ bat_type = TYPE_bit;
SXP_TO_BAT(bit, LOGICAL_POINTER, *p==NA_LOGICAL);
break;
}
diff --git a/sql/backends/monet5/Tests/rapi14.sql
b/sql/backends/monet5/Tests/rapi14.sql
--- a/sql/backends/monet5/Tests/rapi14.sql
+++ b/sql/backends/monet5/Tests/rapi14.sql
@@ -10,6 +10,7 @@ language R
};
SELECT rapi14() FROM dval;
+
DROP FUNCTION rapi14;
DROP TABLE dval;
diff --git a/sql/backends/monet5/Tests/rapi14.stable.err
b/sql/backends/monet5/Tests/rapi14.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/rapi14.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'rapi14` in directory 'sql/backends/monet5` itself:
+
+
+# 10:57:32 >
+# 10:57:32 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30595" "--set"
"mapi_usock=/var/tmp/mtest-36459/.s.monetdb.30595" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/Users/hannes/monetdb-install/var/MonetDB/mTests_sql_backends_monet5"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 10:57:32 >
+
+# builtin opt gdk_dbpath =
/Users/hannes/monetdb-install/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 = 30595
+# cmdline opt mapi_usock = /var/tmp/mtest-36459/.s.monetdb.30595
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/Users/hannes/monetdb-install/var/MonetDB/mTests_sql_backends_monet5
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 10:57:32 >
+# 10:57:32 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-36459" "--port=30595"
+# 10:57:32 >
+
+
+# 10:57:33 >
+# 10:57:33 > "Done."
+# 10:57:33 >
+
diff --git a/sql/backends/monet5/Tests/rapi14.stable.out
b/sql/backends/monet5/Tests/rapi14.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/rapi14.stable.out
@@ -0,0 +1,89 @@
+stdout of test 'rapi14` in directory 'sql/backends/monet5` itself:
+
+
+# 10:57:32 >
+# 10:57:32 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30595" "--set"
"mapi_usock=/var/tmp/mtest-36459/.s.monetdb.30595" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/Users/hannes/monetdb-install/var/MonetDB/mTests_sql_backends_monet5"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 10:57:32 >
+
+# MonetDB 5 server v11.22.0
+# This is an unreleased version
+# Serving database 'mTests_sql_backends_monet5', using 4 threads
+# Compiled for x86_64-apple-darwin14.4.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-2015 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:30595/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-36459/.s.monetdb.30595
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL 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: 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_geom.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: 51_sys_schema_extension.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
+
+# 10:57:32 >
+# 10:57:32 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-36459" "--port=30595"
+# 10:57:32 >
+
+#START TRANSACTION;
+#CREATE TABLE dval(i integer);
+#INSERT INTO dval VALUES (1),(2),(3),(4);
+[ 4 ]
+#CREATE FUNCTION rapi14() returns boolean
+#language R
+#{
+# rep(T,4)
+#};
+#SELECT rapi14() FROM dval;
+% .L # table_name
+% rapi14 # name
+% boolean # type
+% 5 # length
+[ true ]
+[ true ]
+[ true ]
+[ true ]
+#DROP FUNCTION rapi14;
+#DROP TABLE dval;
+#ROLLBACK;
+
+# 10:57:33 >
+# 10:57:33 > "Done."
+# 10:57:33 >
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
