Changeset: 7220ba435135 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7220ba435135
Added Files:
sql/backends/monet5/Tests/rapi00.stable.err
sql/backends/monet5/Tests/rapi00.stable.out
sql/backends/monet5/Tests/rapi01.stable.err
sql/backends/monet5/Tests/rapi01.stable.out
sql/backends/monet5/Tests/rapi02.stable.err
sql/backends/monet5/Tests/rapi02.stable.out
sql/backends/monet5/Tests/rapi03.stable.err
sql/backends/monet5/Tests/rapi03.stable.out
sql/backends/monet5/Tests/rapi04.stable.err
sql/backends/monet5/Tests/rapi04.stable.out
sql/backends/monet5/Tests/rapi05.stable.err
sql/backends/monet5/Tests/rapi05.stable.out
Removed Files:
sql/backends/monet5/Tests/inlineR.sql
Modified Files:
monetdb5/extras/rapi/rapi.R
sql/backends/monet5/Tests/All
sql/backends/monet5/Tests/rapi00.sql
sql/backends/monet5/Tests/rapi01.sql
sql/backends/monet5/Tests/rapi02.sql
sql/backends/monet5/Tests/rapi03.sql
sql/backends/monet5/Tests/rapi04.sql
sql/backends/monet5/Tests/rapi05.sql
sql/backends/monet5/sql_scenario.c
Branch: RIntegration
Log Message:
R API: approved output for SQL test cases and test case consistency updates
diffs (truncated from 1050 to 300 lines):
diff --git a/monetdb5/extras/rapi/rapi.R b/monetdb5/extras/rapi/rapi.R
--- a/monetdb5/extras/rapi/rapi.R
+++ b/monetdb5/extras/rapi/rapi.R
@@ -29,7 +29,7 @@ library <- function(package, help, pos =
package <- as.character(substitute(package))
if (!(package %in% installed.packages()[,"Package"]))
-
install.packages(package,repos=c("http://cran.rstudio.com/";),lib=.rapi.libdir)
+
install.packages(package,repos=c("http://cran.rstudio.com/";),lib=.rapi.libdir,quiet=T)
.library.original(package,help,pos,lib.loc,character.only=T,logical.return,warn.conflicts,quietly)
}
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
@@ -8,7 +8,7 @@ HAVE_LIBR?rapi04
HAVE_LIBR?rapi05
-inlineR
+#inlineR disabled, we have better R tests
inlineUDF
#Mbeddedsql5--help disabled for now
diff --git a/sql/backends/monet5/Tests/inlineR.sql
b/sql/backends/monet5/Tests/inlineR.sql
deleted file mode 100644
--- a/sql/backends/monet5/Tests/inlineR.sql
+++ /dev/null
@@ -1,9 +0,0 @@
--- Simple MonetDB inline R interface
-
-create function one() returns integer language R { return(1); };
-create function addtwo(i integer, j integer) returns integer language R { ret
<- i + j; return(ret);};
-create function adderror(i integer, j integer) returns integer language R { if
( i == int_nil || j == int_nil) throw(SQL,"udf","Nil not allowed"); ret <- i +
j; return(nil);};
-
-select one();
-select addtwo(one(),one());
-select adderror(one(),null);
diff --git a/sql/backends/monet5/Tests/rapi00.sql
b/sql/backends/monet5/Tests/rapi00.sql
--- a/sql/backends/monet5/Tests/rapi00.sql
+++ b/sql/backends/monet5/Tests/rapi00.sql
@@ -1,6 +1,10 @@
-create function rapi00() returns table (d integer)
+START TRANSACTION;
+
+CREATE FUNCTION rapi00() returns table (d integer)
language R {
return(seq(1,10));
};
-select d from rapi00() as R where d > 5;
-drop function rapi00;
+SELECT d FROM rapi00() AS R WHERE d > 5;
+DROP FUNCTION rapi00;
+
+ROLLBACK;
\ No newline at end of file
diff --git a/sql/backends/monet5/Tests/rapi00.stable.err
b/sql/backends/monet5/Tests/rapi00.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/rapi00.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'rapi00` in directory 'sql/backends/monet5` itself:
+
+
+# 17:37:08 >
+# 17:37:08 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35474" "--set"
"mapi_usock=/var/tmp/mtest-20729/.s.monetdb.35474" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/hannes/fakefs/var/MonetDB/mTests_sql_backends_monet5"
"--set" "mal_listing=0"
+# 17:37:08 >
+
+# builtin opt gdk_dbpath =
/export/scratch2/hannes/monetdb-rint-install/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = yes
+# 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 = 35474
+# cmdline opt mapi_usock = /var/tmp/mtest-20729/.s.monetdb.35474
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/export/scratch1/hannes/fakefs/var/MonetDB/mTests_sql_backends_monet5
+# cmdline opt mal_listing = 0
+
+# 17:37:08 >
+# 17:37:08 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-20729" "--port=35474"
+# 17:37:08 >
+
+
+# 17:37:09 >
+# 17:37:09 > "Done."
+# 17:37:09 >
+
diff --git a/sql/backends/monet5/Tests/rapi00.stable.out
b/sql/backends/monet5/Tests/rapi00.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/rapi00.stable.out
@@ -0,0 +1,47 @@
+stdout of test 'rapi00` in directory 'sql/backends/monet5` itself:
+
+
+# 17:37:08 >
+# 17:37:08 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35474" "--set"
"mapi_usock=/var/tmp/mtest-20729/.s.monetdb.35474" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/hannes/fakefs/var/MonetDB/mTests_sql_backends_monet5"
"--set" "mal_listing=0"
+# 17:37:08 >
+
+# MonetDB 5 server v11.18.0
+# This is an unreleased version
+# Serving database 'mTests_sql_backends_monet5', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.592 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://bristol.ins.cwi.nl:35474/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-20729/.s.monetdb.35474
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 17:37:08 >
+# 17:37:08 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-20729" "--port=35474"
+# 17:37:08 >
+
+#create function rapi00() returns table (d integer)
+#language R {
+# return(seq(1,10));
+#};
+#select d from rapi00() as R where d > 5;
+% .r # table_name
+% d # name
+% int # type
+% 2 # length
+[ 6 ]
+[ 7 ]
+[ 8 ]
+[ 9 ]
+[ 10 ]
+#drop function rapi00;
+
+# 17:37:09 >
+# 17:37:09 > "Done."
+# 17:37:09 >
+
diff --git a/sql/backends/monet5/Tests/rapi01.sql
b/sql/backends/monet5/Tests/rapi01.sql
--- a/sql/backends/monet5/Tests/rapi01.sql
+++ b/sql/backends/monet5/Tests/rapi01.sql
@@ -1,6 +1,10 @@
-create function rapi01(i integer) returns table (i integer, d double)
+START TRANSACTION;
+
+CREATE FUNCTION rapi01(i integer) returns table (i integer, d double)
language R {
return(data.frame(seq(1,arg1),42));
};
-select i,d from rapi01(42) as R where i>40;
-drop function rapi01;
+SELECT i,d FROM rapi01(42) AS R WHERE i>40;
+DROP FUNCTION rapi01;
+
+ROLLBACK;
\ No newline at end of file
diff --git a/sql/backends/monet5/Tests/rapi01.stable.err
b/sql/backends/monet5/Tests/rapi01.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/rapi01.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'rapi01` in directory 'sql/backends/monet5` itself:
+
+
+# 17:37:09 >
+# 17:37:09 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35474" "--set"
"mapi_usock=/var/tmp/mtest-20729/.s.monetdb.35474" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/hannes/fakefs/var/MonetDB/mTests_sql_backends_monet5"
"--set" "mal_listing=0"
+# 17:37:09 >
+
+# builtin opt gdk_dbpath =
/export/scratch2/hannes/monetdb-rint-install/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = yes
+# 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 = 35474
+# cmdline opt mapi_usock = /var/tmp/mtest-20729/.s.monetdb.35474
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/export/scratch1/hannes/fakefs/var/MonetDB/mTests_sql_backends_monet5
+# cmdline opt mal_listing = 0
+
+# 17:37:09 >
+# 17:37:09 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-20729" "--port=35474"
+# 17:37:09 >
+
+
+# 17:37:09 >
+# 17:37:09 > "Done."
+# 17:37:09 >
+
diff --git a/sql/backends/monet5/Tests/rapi01.stable.out
b/sql/backends/monet5/Tests/rapi01.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/rapi01.stable.out
@@ -0,0 +1,44 @@
+stdout of test 'rapi01` in directory 'sql/backends/monet5` itself:
+
+
+# 17:37:09 >
+# 17:37:09 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35474" "--set"
"mapi_usock=/var/tmp/mtest-20729/.s.monetdb.35474" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/hannes/fakefs/var/MonetDB/mTests_sql_backends_monet5"
"--set" "mal_listing=0"
+# 17:37:09 >
+
+# MonetDB 5 server v11.18.0
+# This is an unreleased version
+# Serving database 'mTests_sql_backends_monet5', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.592 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://bristol.ins.cwi.nl:35474/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-20729/.s.monetdb.35474
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 17:37:09 >
+# 17:37:09 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-20729" "--port=35474"
+# 17:37:09 >
+
+#create function rapi01(i integer) returns table (i integer, d double)
+#language R {
+# return(data.frame(seq(1,arg1),42));
+#};
+#select i,d from rapi01(42) as R where i>40;
+% .r, .r # table_name
+% i, d # name
+% int, double # type
+% 2, 24 # length
+[ 41, 42 ]
+[ 42, 42 ]
+#drop function rapi01;
+
+# 17:37:09 >
+# 17:37:09 > "Done."
+# 17:37:09 >
+
diff --git a/sql/backends/monet5/Tests/rapi02.sql
b/sql/backends/monet5/Tests/rapi02.sql
--- a/sql/backends/monet5/Tests/rapi02.sql
+++ b/sql/backends/monet5/Tests/rapi02.sql
@@ -1,12 +1,14 @@
-create table rval(i integer,j integer);
-insert into rval values (1,4), (2,3), (3,2), (4,1);
+START TRANSACTION;
-create function rapi02(i integer,j integer,z integer) returns integer
+CREATE TABLE rval(i integer,j integer);
+INSERT INTO rval VALUES (1,4), (2,3), (3,2), (4,1);
+
+CREATE FUNCTION rapi02(i integer,j integer,z integer) returns integer
language R {
return(arg1*sum(arg2)*arg3);
};
-select rapi02(i,j,2) from rval;
-drop function rapi02;
-drop table rval;
+SELECT rapi02(i,j,2) FROM rval;
+DROP FUNCTION rapi02;
+DROP TABLE rval;
-
+ROLLBACK;
\ No newline at end of file
diff --git a/sql/backends/monet5/Tests/rapi02.stable.err
b/sql/backends/monet5/Tests/rapi02.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/rapi02.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'rapi02` in directory 'sql/backends/monet5` itself:
+
+
+# 17:37:09 >
+# 17:37:09 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35474" "--set"
"mapi_usock=/var/tmp/mtest-20729/.s.monetdb.35474" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/hannes/fakefs/var/MonetDB/mTests_sql_backends_monet5"
"--set" "mal_listing=0"
+# 17:37:09 >
+
+# builtin opt gdk_dbpath =
/export/scratch2/hannes/monetdb-rint-install/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
