Changeset: 59e4552e5615 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=59e4552e5615
Added Files:
sql/backends/monet5/Tests/rapi13.stable.err
sql/backends/monet5/Tests/rapi13.stable.out
sql/backends/monet5/Tests/rapi14.stable.err
sql/backends/monet5/Tests/rapi14.stable.out
sql/backends/monet5/Tests/rapi15.sql
sql/backends/monet5/Tests/rapi15.stable.err
sql/backends/monet5/Tests/rapi15.stable.out
Modified Files:
clients/R/Tests/deps-install.R
clients/R/Tests/deps-test.R
monetdb5/extras/rapi/Tests/All
monetdb5/extras/rapi/rapi.c
sql/backends/monet5/Tests/All
sql/backends/monet5/Tests/rapi14.sql
sql/server/sql_privileges.c
Branch: default
Log Message:
Merged with default.
diffs (truncated from 806 to 300 lines):
diff --git a/clients/R/Tests/deps-install.R b/clients/R/Tests/deps-install.R
--- a/clients/R/Tests/deps-install.R
+++ b/clients/R/Tests/deps-install.R
@@ -2,7 +2,7 @@
dir.create(unlist(strsplit(Sys.getenv("R_LIBS_USER"),
.Platform$path.sep))[1L], recursive = TRUE, showWarnings=F)
# autoinstall DBI and digest, we need those to install MonetDB.R
-dd <- capture.output( suppressMessages ( {
+dd <- capture.output(suppressMessages(suppressWarnings({
(function(lp) {
np <- lp[!(lp %in% installed.packages()[,"Package"])]
repos <- "http://cran.rstudio.com/";
@@ -10,5 +10,4 @@ dd <- capture.output( suppressMessages (
update.packages(repos=repos, ask=F, oldPkgs=lp, type="source", quiet=T)
x <- lapply(lp,function(x){library(x,character.only=TRUE,quietly=T)})
})(c("DBI", "digest"))
-}))
-
+})))
diff --git a/clients/R/Tests/deps-test.R b/clients/R/Tests/deps-test.R
--- a/clients/R/Tests/deps-test.R
+++ b/clients/R/Tests/deps-test.R
@@ -1,5 +1,5 @@
# autoinstall stuff to test sqlsurvey and dplyr
-dd <- capture.output( suppressMessages ( {
+dd <- capture.output(suppressMessages(suppressWarnings({
(function(lp) {
np <- lp[!(lp %in% installed.packages()[,"Package"])]
repos <-
c('http://download.r-forge.r-project.org','http://cran.rstudio.com/')
@@ -7,5 +7,4 @@ dd <- capture.output( suppressMessages (
update.packages(repos=repos, ask=F, oldPkgs=lp, type="source", quiet=T)
x <- lapply(lp,function(x){library(x,character.only=TRUE,quietly=T)})
})(c('Rcpp', 'dplyr','survey','sqlsurvey','Lahman','nycflights13'))
-}))
-
+})))
diff --git a/monetdb5/extras/rapi/Tests/All b/monetdb5/extras/rapi/Tests/All
--- a/monetdb5/extras/rapi/Tests/All
+++ b/monetdb5/extras/rapi/Tests/All
@@ -7,3 +7,4 @@ HAVE_LIBR?rapi05
HAVE_LIBR?rapi06
HAVE_LIBR?rapi07
HAVE_LIBR?rapi08
+HAVE_LIBR?rapi09
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
@@ -615,6 +615,12 @@ str RAPIeval(Client cntxt, MalBlkPtr mb,
for (i = 0; i < pci->retc; i++) {
SEXP ret_col = VECTOR_ELT(retval, i);
int bat_type = ATOMstorage(getColumnType(getArgType(mb,pci,i)));
+ if (bat_type == TYPE_any || bat_type == TYPE_void) {
+ getArgType(mb,pci,i) = bat_type;
+ msg = createException(MAL, "rapi.eval",
+
"Unknown return value, possibly projecting with no parameters.");
+ goto wrapup;
+ }
cnt = (BUN) ret_rows;
// hand over the vector into a BAT
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,9 @@ HAVE_LIBR?rapi07
HAVE_LIBR?rapi09
HAVE_LIBR?rapi10
HAVE_LIBR?rapi12
+HAVE_LIBR?rapi13
+HAVE_LIBR?rapi14
+HAVE_LIBR?rapi15
# should this work?
#inlineUDF
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:
+
+
+# 09:48:02 >
+# 09:48:02 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30337" "--set"
"mapi_usock=/var/tmp/mtest-14428/.s.monetdb.30337" "--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"
+# 09:48:02 >
+
+# 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 = 30337
+# cmdline opt mapi_usock = /var/tmp/mtest-14428/.s.monetdb.30337
+# 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
+
+# 09:48:03 >
+# 09:48:03 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-14428" "--port=30337"
+# 09:48:03 >
+
+
+# 09:48:03 >
+# 09:48:03 > "Done."
+# 09:48:03 >
+
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,135 @@
+stdout of test 'rapi13` in directory 'sql/backends/monet5` itself:
+
+
+# 09:48:02 >
+# 09:48:02 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30337" "--set"
"mapi_usock=/var/tmp/mtest-14428/.s.monetdb.30337" "--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"
+# 09:48:02 >
+
+# 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:30337/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-14428/.s.monetdb.30337
+# 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
+
+# 09:48:03 >
+# 09:48:03 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-14428" "--port=30337"
+# 09:48:03 >
+
+#start transaction;
+#CREATE TABLE "streams" (
+# "ts" TIMESTAMP,
+# "type" TINYINT,
+# "station" CHARACTER LARGE OBJECT,
+# "lat" DOUBLE,
+# "lon" DOUBLE,
+# "alt" DOUBLE
+#);
+#copy 5 records into streams from stdin;
+#2015-06-03 15:11:17.000000|2|"4CA56B"|52.08069|5.86654|3.8e+04
+#2015-06-03 15:11:17.000000|2|"4010EA"|51.19084|4.98646|38025
+#2015-06-03 15:11:17.000000|2|"406C71"|52.36768|7.17085|3.5e+04
+#2015-06-03 15:11:17.000000|2|"4006A4"|52.44951|5.21294|37025
+#2015-06-03 15:11:17.000000|2|"45AC45"|52.12491|6.03063|3.6e+04
+[ 5 ]
+#CREATE FUNCTION working_test(stt string, tss bigint, lat double, lon double,
alt double) returns table (i int, j int, k int) language R {
+# return(data.frame(1:10, 1:10, 1:10))
+#};
+#CREATE FUNCTION broken_test(stt string, tss bigint, lat double, lon double,
alt double) returns table (i int, j int, k int, l int) language R {
+# return(data.frame(1:10, 1:10, 1:10, 1:10))
+#};
+#create temporary table planes as SELECT station, (ts-CAST('1970-01-01' AS
timestamp)), lat, lon, alt*0.3048 FROM streams WHERE type = 2 and alt > 0 with
data;
+#select * from planes;
+% tmp.planes, tmp.planes, tmp.planes, tmp.planes, tmp.planes #
table_name
+% station, L2, lat, lon, v # name
+% clob, sec_interval, double, double, double # type
+% 8, 0, 24, 24, 24 # length
+[ "\"4CA56B\"", 1433344277.000, 52.08069, 5.86654, 11582.4
]
+[ "\"4010EA\"", 1433344277.000, 51.19084, 4.98646,
11590.02 ]
+[ "\"406C71\"", 1433344277.000, 52.36768, 7.17085, 10668
]
+[ "\"4006A4\"", 1433344277.000, 52.44951, 5.21294,
11285.22 ]
+[ "\"45AC45\"", 1433344277.000, 52.12491, 6.03063, 10972.8
]
+#select * from working_test( (SELECT * FROM planes AS p) );
+% ., ., . # table_name
+% i, j, k # name
+% int, int, int # type
+% 2, 2, 2 # length
+[ 1, 1, 1 ]
+[ 2, 2, 2 ]
+[ 3, 3, 3 ]
+[ 4, 4, 4 ]
+[ 5, 5, 5 ]
+[ 6, 6, 6 ]
+[ 7, 7, 7 ]
+[ 8, 8, 8 ]
+[ 9, 9, 9 ]
+[ 10, 10, 10 ]
+#select * from broken_test( (SELECT * FROM planes AS p) );
+% ., ., ., . # table_name
+% i, j, k, l # name
+% int, int, int, int # type
+% 2, 2, 2, 2 # length
+[ 1, 1, 1, 1 ]
+[ 2, 2, 2, 2 ]
+[ 3, 3, 3, 3 ]
+[ 4, 4, 4, 4 ]
+[ 5, 5, 5, 5 ]
+[ 6, 6, 6, 6 ]
+[ 7, 7, 7, 7 ]
+[ 8, 8, 8, 8 ]
+[ 9, 9, 9, 9 ]
+[ 10, 10, 10, 10 ]
+#drop table planes;
+#drop function working_test;
+#drop function broken_test;
+#rollback;
+
+# 09:48:03 >
+# 09:48:03 > "Done."
+# 09:48:03 >
+
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,8 +10,9 @@ language R
};
SELECT rapi14() FROM dval;
-DROP FUNCTION rapi14;
-DROP TABLE dval;
+
+--DROP FUNCTION rapi14;
+--DROP TABLE dval;
ROLLBACK;
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,40 @@
+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
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
