MonetDB: embedded - Bugs #3904 #3892 #3886

[Hannes Muehleisen]

Changeset: 039448111253 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=039448111253
Modified Files:
        tools/embedded/Tests/lowlevel.R
        tools/embedded/rpackage/R/monetdb.R
Branch: embedded
Log Message:

Bugs #3904 #3892 #3886


diffs (44 lines):

diff --git a/tools/embedded/Tests/lowlevel.R b/tools/embedded/Tests/lowlevel.R
--- a/tools/embedded/Tests/lowlevel.R
+++ b/tools/embedded/Tests/lowlevel.R
@@ -127,7 +127,7 @@ test_that("inserting data", {
 })
 
 test_that("the garbage collector closes connections", {
-       # there are 64 connections max. if gc() does not close them, the last 
line will provoke a crash
+       # there are 64 connections max. if gc() does not close them, the second 
batch will fail
        conns <- lapply(1:64, function(x) monetdb_embedded_connect())
        expect_error(monetdb_embedded_connect())
 
@@ -137,7 +137,6 @@ test_that("the garbage collector closes 
        conns <- lapply(1:64, function(x) monetdb_embedded_connect())
        rm(conns)
        gc()
-       monetdb_embedded_connect()
 })
 
 
diff --git a/tools/embedded/rpackage/R/monetdb.R 
b/tools/embedded/rpackage/R/monetdb.R
--- a/tools/embedded/rpackage/R/monetdb.R
+++ b/tools/embedded/rpackage/R/monetdb.R
@@ -13,18 +13,17 @@ libfilename <- "libmonetdb5"
 classname <- "monetdb_embedded_connection"
 
 monetdb_embedded_startup <- function(dir=tempdir(), quiet=TRUE) {
-       dir <- as.character(dir)
+       dir <- normalizePath(as.character(dir), mustWork=F)
        quiet <- as.logical(quiet)
        if (length(dir) != 1) {
                stop("Need a single directory name as parameter.")
        }
-       if (!file.exists(dir) && !dir.create(dir, recursive=T)) {
+       if (!dir.exists(dir) && !dir.create(dir, recursive=T)) {
                stop("Cannot create ", dir)
        }
        if (file.access(dir, mode=2) < 0) {
                stop("Cannot write to ", dir)
        }
-       dir <- normalizePath(dir)
        if (!monetdb_embedded_env$is_started) {
                res <- .Call("monetdb_startup_R", dir, quiet, 
PACKAGE=libfilename)
        } else {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list