Changeset: b8e89ca35c55 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b8e89ca35c55
Removed Files:
clients/R/Tests/All
clients/R/Tests/SingleServer
clients/R/Tests/copy_into_fwf.R
clients/R/Tests/copy_into_fwf.reqtests
clients/R/Tests/copy_into_fwf.stable.err
clients/R/Tests/copy_into_fwf.stable.out
clients/R/Tests/dbapply.R
clients/R/Tests/dbapply.reqtests
clients/R/Tests/dbapply.stable.err
clients/R/Tests/dbapply.stable.out
clients/R/Tests/dbi.R
clients/R/Tests/dbi.reqtests
clients/R/Tests/dbi.stable.err
clients/R/Tests/dbi.stable.out
clients/R/Tests/deps-install.R
clients/R/Tests/deps-install.stable.err
clients/R/Tests/deps-install.stable.out
clients/R/Tests/deps-install.timeout
clients/R/Tests/deps-test.R
clients/R/Tests/deps-test.stable.err
clients/R/Tests/deps-test.stable.out
clients/R/Tests/deps-test.timeout
clients/R/Tests/dplyr-flights.R
clients/R/Tests/dplyr-flights.reqtests
clients/R/Tests/dplyr-flights.stable.err
clients/R/Tests/dplyr-flights.stable.out
clients/R/Tests/dplyr.R
clients/R/Tests/dplyr.reqtests
clients/R/Tests/dplyr.stable.err
clients/R/Tests/dplyr.stable.out
clients/R/Tests/dplyr.timeout
clients/R/Tests/install.R
clients/R/Tests/install.reqtests
clients/R/Tests/install.stable.err
clients/R/Tests/install.stable.out
clients/R/Tests/install.timeout
clients/R/Tests/testrandom.R
clients/R/Tests/testrandom.reqtests
clients/R/Tests/testrandom.stable.err
clients/R/Tests/testrandom.stable.out
Branch: mtest
Log Message:
The R tests will be merged into the unit tests of the MonetDB.R connector
diffs (truncated from 1799 to 300 lines):
diff --git a/clients/R/Tests/All b/clients/R/Tests/All
deleted file mode 100644
--- a/clients/R/Tests/All
+++ /dev/null
@@ -1,8 +0,0 @@
-HAVE_LIBR?deps-install
-HAVE_LIBR?install
-HAVE_LIBR?deps-test
-HAVE_LIBR?dbi
-#HAVE_LIBR?dplyr too slow
-#HAVE_LIBR?dplyr-flights they keep changing this
-HAVE_LIBR?copy_into_fwf
-HAVE_LIBR&NOT_WIN32?dbapply
diff --git a/clients/R/Tests/SingleServer b/clients/R/Tests/SingleServer
deleted file mode 100644
--- a/clients/R/Tests/SingleServer
+++ /dev/null
@@ -1,1 +0,0 @@
---set embedded_r=yes
diff --git a/clients/R/Tests/copy_into_fwf.R b/clients/R/Tests/copy_into_fwf.R
deleted file mode 100644
--- a/clients/R/Tests/copy_into_fwf.R
+++ /dev/null
@@ -1,35 +0,0 @@
-if (Sys.getenv("TSTTRGDIR") != "") {
- .libPaths(c(.libPaths(), paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")))
-}
-library(DBI, quietly = T)
-
-args <- commandArgs(trailingOnly = TRUE)
-dbport <- 50000
-dbname <- "mTests_clients_R"
-if (length(args) > 0)
- dbport <- args[[1]]
-if (length(args) > 1)
- dbname <- args[[2]]
-
-con <- dbConnect(MonetDBLite::MonetDB(), port = dbport, dbname = dbname, wait
= T)
-stopifnot(dbIsValid(con))
-
-tf <- tempfile()
-
-gdata::write.fwf(mtcars, tf, colnames = FALSE)
-
-if (dbExistsTable(con, "mtcars")) dbRemoveTable(con, "mtcars")
-
-dbBegin(con)
-dbSendQuery(con, "CREATE TABLE mtcars (mpg DOUBLE PRECISION, cyl DOUBLE
PRECISION, disp DOUBLE PRECISION, hp DOUBLE PRECISION, drat DOUBLE PRECISION,
wt DOUBLE PRECISION, qsec DOUBLE PRECISION, vs DOUBLE PRECISION, am DOUBLE
PRECISION, gear DOUBLE PRECISION, carb DOUBLE PRECISION)")
-
-# delimiters are ineffective for fwf import just set them to make sure they
dont break stuff
-res <- dbSendQuery(con, paste0("COPY OFFSET 1 INTO mtcars FROM '", tf, "'
USING DELIMITERS 'a','b','c' NULL AS '' FWF (4, 2, 6, 4, 5, 6, 6, 2, 2, 2, 2)"))
-
-print(dbReadTable(con, "mtcars"))
-
-stopifnot(nrow(dbReadTable(con, "mtcars")) > 1)
-
-dbRollback(con)
-
-print("SUCCESS")
diff --git a/clients/R/Tests/copy_into_fwf.reqtests
b/clients/R/Tests/copy_into_fwf.reqtests
deleted file mode 100644
--- a/clients/R/Tests/copy_into_fwf.reqtests
+++ /dev/null
@@ -1,1 +0,0 @@
-dbi
diff --git a/clients/R/Tests/copy_into_fwf.stable.err
b/clients/R/Tests/copy_into_fwf.stable.err
deleted file mode 100644
--- a/clients/R/Tests/copy_into_fwf.stable.err
+++ /dev/null
@@ -1,35 +0,0 @@
-stderr of test 'copy_into_fwf` in directory 'clients/R` itself:
-
-
-# 16:40:22 >
-# 16:40:22 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30658" "--set"
"mapi_usock=/var/tmp/mtest-16034/.s.monetdb.30658" "--set" "monet_prompt="
"--forcemito" "--dbpath=/tmp/fuckit/var/MonetDB/mTests_clients_R" "--set"
"embedded_r=yes"
-# 16:40:22 >
-
-# 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 = 30658
-# cmdline opt mapi_usock = /var/tmp/mtest-16034/.s.monetdb.30658
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbpath = /tmp/fuckit/var/MonetDB/mTests_clients_R
-# cmdline opt embedded_r = yes
-# cmdline opt gdk_debug = 536870922
-
-# 16:40:23 >
-# 16:40:23 > "R" "--vanilla" "--slave" "--args" "30658"
-# 16:40:23 >
-
-
-# 16:40:23 >
-# 16:40:23 > "Done."
-# 16:40:23 >
-
diff --git a/clients/R/Tests/copy_into_fwf.stable.out
b/clients/R/Tests/copy_into_fwf.stable.out
deleted file mode 100644
--- a/clients/R/Tests/copy_into_fwf.stable.out
+++ /dev/null
@@ -1,68 +0,0 @@
-stdout of test 'copy_into_fwf` in directory 'clients/R` itself:
-
-
-# 16:40:22 >
-# 16:40:22 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30658" "--set"
"mapi_usock=/var/tmp/mtest-16034/.s.monetdb.30658" "--set" "monet_prompt="
"--forcemito" "--dbpath=/tmp/fuckit/var/MonetDB/mTests_clients_R" "--set"
"embedded_r=yes"
-# 16:40:22 >
-
-# MonetDB 5 server v11.24.0
-# This is an unreleased version
-# Serving database 'mTests_clients_R', 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:30658/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-16034/.s.monetdb.30658
-# MonetDB/SQL module loaded
-# MonetDB/R module loaded
-
-
-# 16:40:23 >
-# 16:40:23 > "R" "--vanilla" "--slave" "--args" "30658"
-# 16:40:23 >
-
-<MonetDBResult>
- SQL CREATE TABLE mtcars (mpg DOUBLE PRECISION, cyl DOUBLE PRECISION, disp
DOUBLE PRECISION, hp DOUBLE PRECISION, drat DOUBLE PRECISION, wt DOUBLE
PRECISION, qsec DOUBLE PRECISION, vs DOUBLE PRECISION, am DOUBLE PRECISION,
gear DOUBLE PRECISION, carb DOUBLE PRECISION)
- ROWS Fetched: 0 [complete]
- Changed: NA
- mpg cyl disp hp drat wt qsec vs am gear carb
-1 21.0 6 160.0 110 3.90 2.620 16.46 0 1 4 4
-2 21.0 6 160.0 110 3.90 2.875 17.02 0 1 4 4
-3 22.8 4 108.0 93 3.85 2.320 18.61 1 1 4 1
-4 21.4 6 258.0 110 3.08 3.215 19.44 1 0 3 1
-5 18.7 8 360.0 175 3.15 3.440 17.02 0 0 3 2
-6 18.1 6 225.0 105 2.76 3.460 20.22 1 0 3 1
-7 14.3 8 360.0 245 3.21 3.570 15.84 0 0 3 4
-8 24.4 4 146.7 62 3.69 3.190 20.00 1 0 4 2
-9 22.8 4 140.8 95 3.92 3.150 22.90 1 0 4 2
-10 19.2 6 167.6 123 3.92 3.440 18.30 1 0 4 4
-11 17.8 6 167.6 123 3.92 3.440 18.90 1 0 4 4
-12 16.4 8 275.8 180 3.07 4.070 17.40 0 0 3 3
-13 17.3 8 275.8 180 3.07 3.730 17.60 0 0 3 3
-14 15.2 8 275.8 180 3.07 3.780 18.00 0 0 3 3
-15 10.4 8 472.0 205 2.93 5.250 17.98 0 0 3 4
-16 10.4 8 460.0 215 3.00 5.424 17.82 0 0 3 4
-17 14.7 8 440.0 230 3.23 5.345 17.42 0 0 3 4
-18 32.4 4 78.7 66 4.08 2.200 19.47 1 1 4 1
-19 30.4 4 75.7 52 4.93 1.615 18.52 1 1 4 2
-20 33.9 4 71.1 65 4.22 1.835 19.90 1 1 4 1
-21 21.5 4 120.1 97 3.70 2.465 20.01 1 0 3 1
-22 15.5 8 318.0 150 2.76 3.520 16.87 0 0 3 2
-23 15.2 8 304.0 150 3.15 3.435 17.30 0 0 3 2
-24 13.3 8 350.0 245 3.73 3.840 15.41 0 0 3 4
-25 19.2 8 400.0 175 3.08 3.845 17.05 0 0 3 2
-26 27.3 4 79.0 66 4.08 1.935 18.90 1 1 4 1
-27 26.0 4 120.3 91 4.43 2.140 16.70 0 1 5 2
-28 30.4 4 95.1 113 3.77 1.513 16.90 1 1 5 2
-29 15.8 8 351.0 264 4.22 3.170 14.50 0 1 5 4
-30 19.7 6 145.0 175 3.62 2.770 15.50 0 1 5 6
-31 15.0 8 301.0 335 3.54 3.570 14.60 0 1 5 8
-32 21.4 4 121.0 109 4.11 2.780 18.60 1 1 4 2
-[1] "SUCCESS"
-
-# 16:40:23 >
-# 16:40:23 > "Done."
-# 16:40:23 >
-
diff --git a/clients/R/Tests/dbapply.R b/clients/R/Tests/dbapply.R
deleted file mode 100644
--- a/clients/R/Tests/dbapply.R
+++ /dev/null
@@ -1,88 +0,0 @@
-cat("#~BeginProfilingOutput~#\n", file=stderr())
-
-if (Sys.getenv("TSTTRGDIR") != "") {
- .libPaths(c(.libPaths(), paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")))
-}
-library(DBI, quietly = T)
-
-args <- commandArgs(trailingOnly = TRUE)
-dbport <- 50000
-dbname <- "mTests_clients_R"
-if (length(args) > 0)
- dbport <- args[[1]]
-if (length(args) > 1)
- dbname <- args[[2]]
-
-options(monetdb.insert.splitsize=10)
-
-tname <- "monetdbtest"
-
-con <- dbConnect(MonetDBLite::MonetDB(), port=dbport, dbname=dbname, wait=T)
-stopifnot(dbIsValid(con))
-
-#options(monetdb.debug.query=T)
-# make sure embedded R is working in general
-dbBegin(con)
-invisible(dbSendQuery(con, "CREATE FUNCTION fuuu() RETURNS TABLE(i INTEGER)
LANGUAGE R {42L}"))
-res <- dbGetQuery(con, "SELECT * FROM fuuu();")
-stopifnot(identical(42L, res$i[[1]]))
-dbRollback(con)
-
-data(mtcars)
-dbWriteTable(con,tname,mtcars, overwrite=T)
-stopifnot(identical(TRUE, dbExistsTable(con,tname)))
-
-res <- MonetDBLite::mdbapply(con, tname, function(d) {
- d$mpg
-})
-stopifnot(identical(res, mtcars$mpg))
-
-res <- MonetDBLite::mdbapply(con, tname, function(d) {
- min(d$mpg)
-})
-stopifnot(identical(res, min(mtcars$mpg)))
-
-# model fitting / in-db application
-fitted <- lm(mpg~., data=mtcars)
-predictions <- MonetDBLite::mdbapply(con, tname, function(d) {
- predict(fitted, newdata=data.frame(d, stringsAsFactors=T))
-})
-
-stopifnot(identical(unname(predict(fitted, newdata=mtcars)),
unname(predictions)))
-
-print(length(predictions))
-
-# make sure we bubble up the error
-haderror <- FALSE
-tryCatch({
- res <- MonetDBLite::mdbapply(con,tname,function(d) {
- stop("i am an error")
- })
-}, error=function(e) {
- haderror <<- TRUE
-})
-stopifnot(haderror)
-
-print(haderror)
-
-# run simple test again to make sure the error did dbRollback() and we are
consistent
-res <- MonetDBLite::mdbapply(con, tname, function(d) {
- d$mpg
-})
-stopifnot(identical(res, mtcars$mpg))
-
-print(length(res))
-
-# additional parameters
-res <- MonetDBLite::mdbapply(con,tname,function(d, n, m) {
- n+m
-}, 20, 22)
-
-print(res)
-
-dbRemoveTable(con,tname)
-stopifnot(identical(FALSE, dbExistsTable(con,tname)))
-
-cat("#~EndProfilingOutput~#\n", file=stderr())
-
-print("SUCCESS")
diff --git a/clients/R/Tests/dbapply.reqtests b/clients/R/Tests/dbapply.reqtests
deleted file mode 100644
--- a/clients/R/Tests/dbapply.reqtests
+++ /dev/null
@@ -1,1 +0,0 @@
-dbi
diff --git a/clients/R/Tests/dbapply.stable.err
b/clients/R/Tests/dbapply.stable.err
deleted file mode 100644
--- a/clients/R/Tests/dbapply.stable.err
+++ /dev/null
@@ -1,37 +0,0 @@
-stderr of test 'dbapply` in directory 'clients/R` itself:
-
-
-# 11:43:10 >
-# 11:43:10 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35780" "--set"
"mapi_usock=/var/tmp/mtest-66645/.s.monetdb.35780" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/Users/hannes/monetdb-install/var/MonetDB/mTests_clients_R" "--set"
"mal_listing=0" "--set" "embedded_r=yes"
-# 11:43:10 >
-
-# 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
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
