Changeset: 86ce074459d9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=86ce074459d9
Added Files:
sql/backends/monet5/Tests/rapi13.sql
sql/backends/monet5/Tests/rapi13.stable.err
sql/backends/monet5/Tests/rapi13.stable.out
Modified Files:
sql/backends/monet5/Tests/All
Branch: Jul2015
Log Message:
R Integration: Make sure function calls within VIEW definitions work
diffs (148 lines):
diff --git a/sql/backends/monet5/Tests/All b/sql/backends/monet5/Tests/All
--- a/sql/backends/monet5/Tests/All
+++ b/sql/backends/monet5/Tests/All
@@ -12,6 +12,7 @@ HAVE_LIBR?rapi07
HAVE_LIBR?rapi09
HAVE_LIBR?rapi10
HAVE_LIBR?rapi12
+HAVE_LIBR?rapi13
# should this work?
#inlineUDF
diff --git a/sql/backends/monet5/Tests/rapi13.sql
b/sql/backends/monet5/Tests/rapi13.sql
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/rapi13.sql
@@ -0,0 +1,19 @@
+START TRANSACTION;
+
+CREATE TABLE rapi13(a INTEGER, b DOUBLE);
+INSERT INTO rapi13 VALUES (1,1.2), (1,2.2), (2,2.5), (2,0.9);
+
+
+CREATE FUNCTION rapi13(a INTEGER, b DOUBLE) RETURNS TABLE (c INTEGER, d
DOUBLE) LANGUAGE R {
+data.frame(c=a,d=b)};
+
+SELECT * FROM rapi13((SELECT A, B FROM rapi13 AS X));
+
+CREATE VIEW rapi13v AS SELECT * FROM rapi13((SELECT A, B FROM rapi13 AS X));
+SELECT * FROM rapi13v;
+
+DROP VIEW rapi13v;
+DROP FUNCTION rapi13;
+DROP TABLE rapi13;
+
+ROLLBACK;
\ No newline at end of file
diff --git a/sql/backends/monet5/Tests/rapi13.stable.err
b/sql/backends/monet5/Tests/rapi13.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/rapi13.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'rapi13` in directory 'sql/backends/monet5` itself:
+
+
+# 15:09:46 >
+# 15:09:46 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39522" "--set"
"mapi_usock=/var/tmp/mtest-20642/.s.monetdb.39522" "--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"
+# 15:09:46 >
+
+# 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 = 39522
+# cmdline opt mapi_usock = /var/tmp/mtest-20642/.s.monetdb.39522
+# 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
+
+# 15:09:46 >
+# 15:09:46 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-20642" "--port=39522"
+# 15:09:46 >
+
+
+# 15:09:46 >
+# 15:09:46 > "Done."
+# 15:09:46 >
+
diff --git a/sql/backends/monet5/Tests/rapi13.stable.out
b/sql/backends/monet5/Tests/rapi13.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/rapi13.stable.out
@@ -0,0 +1,65 @@
+stdout of test 'rapi13` in directory 'sql/backends/monet5` itself:
+
+
+# 15:09:46 >
+# 15:09:46 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39522" "--set"
"mapi_usock=/var/tmp/mtest-20642/.s.monetdb.39522" "--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"
+# 15:09:46 >
+
+# MonetDB 5 server v11.21.2
+# 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:39522/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-20642/.s.monetdb.39522
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.4'
+# Finished reading the write-ahead log 'sql_logs/sql/log.4'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 15:09:46 >
+# 15:09:46 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-20642" "--port=39522"
+# 15:09:46 >
+
+#START TRANSACTION;
+#CREATE TABLE rapi13(a INTEGER, b DOUBLE);
+#INSERT INTO rapi13 VALUES (1,1.2), (1,2.2), (2,2.5), (2,0.9);
+[ 4 ]
+#CREATE FUNCTION rapi13(a INTEGER, b DOUBLE) RETURNS TABLE (c INTEGER, d
DOUBLE) LANGUAGE R {
+#data.frame(c=a,d=b)};
+#SELECT * FROM rapi13((SELECT A, B FROM rapi13 AS X));
+% ., . # table_name
+% c, d # name
+% int, double # type
+% 1, 24 # length
+[ 1, 1.2 ]
+[ 1, 2.2 ]
+[ 2, 2.5 ]
+[ 2, 0.9 ]
+#CREATE VIEW rapi13v AS SELECT * FROM rapi13((SELECT A, B FROM rapi13 AS X));
+#SELECT * FROM rapi13v;
+% .rapi13v, .rapi13v # table_name
+% c, d # name
+% int, double # type
+% 1, 24 # length
+[ 1, 1.2 ]
+[ 1, 2.2 ]
+[ 2, 2.5 ]
+[ 2, 0.9 ]
+#DROP VIEW rapi13v;
+#DROP FUNCTION rapi13;
+#DROP TABLE rapi13;
+#ROLLBACK;
+
+# 15:09:46 >
+# 15:09:46 > "Done."
+# 15:09:46 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
