Changeset: 596891ad304a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=596891ad304a
Modified Files:
clients/R/MonetDB.R/R/dbi.R
clients/R/build-for-cran.sh
tools/embedded/Tests/dbi.R
Branch: embedded
Log Message:
Added debug output when query finishes
***
mc
***
mc
diffs (70 lines):
diff --git a/clients/R/MonetDB.R/R/dbi.R b/clients/R/MonetDB.R/R/dbi.R
--- a/clients/R/MonetDB.R/R/dbi.R
+++ b/clients/R/MonetDB.R/R/dbi.R
@@ -336,9 +336,9 @@ setMethod("dbSendQuery", signature(conn=
}
env <- NULL
if (getOption("monetdb.debug.query", F)) message("QQ: '", statement, "'")
-
+ startt <- Sys.time()
resp <- MonetDBLite::monetdb_embedded_query(conn@connenv$conn, statement,
notreally)
-
+ takent <- round(as.numeric(Sys.time() - startt), 2)
env <- new.env(parent=emptyenv())
if (resp$type == Q_TABLE) {
meta <- new.env(parent=emptyenv())
@@ -388,6 +388,7 @@ setMethod("dbSendQuery", signature(conn=
stop("Unable to execute statement '", statement, "'.\nServer says '",
env$message, "'.")
}
}
+ if (getOption("monetdb.debug.query", F)) message("II: Finished in ", takent,
"s")
invisible(new("MonetDBEmbeddedResult", env=env))
})
diff --git a/clients/R/build-for-cran.sh b/clients/R/build-for-cran.sh
--- a/clients/R/build-for-cran.sh
+++ b/clients/R/build-for-cran.sh
@@ -25,7 +25,7 @@ mkdir -p /tmp/rcheck
$R CMD check -o /tmp/rcheck --as-cran MonetDB.R_*.tar.gz
#scp MonetDB.R_*.tar.gz cwi:WWW/R/
-scp MonetDB.R_*.tar.gz [email protected]:/var/www/html/Assets/R/
+echo scp MonetDB.R_*.tar.gz [email protected]:/var/www/html/Assets/R/
#hgid=`hg id -i | sed s/+//`
#newname=`basename MonetDB.R_*.tar.gz .tar.gz`-$hgid.tar.gz
diff --git a/tools/embedded/Tests/dbi.R b/tools/embedded/Tests/dbi.R
--- a/tools/embedded/Tests/dbi.R
+++ b/tools/embedded/Tests/dbi.R
@@ -6,14 +6,14 @@ if (basedir != "") {
}
library(MonetDB.R)
library(testthat)
-
+dbdir <- tempdir()
tname <- "monetdbtest"
data(iris)
tsize <- function(conn, tname)
as.integer(dbGetQuery(conn, paste0("SELECT COUNT(*) FROM ",tname))[[1]])
test_that("db starts up and accepts queries", {
- con <<- dbConnect(MonetDBLite(), tempdir())
+ con <<- dbConnect(MonetDBLite(), dbdir)
expect_is(con, "MonetDBEmbeddedConnection")
expect_true(dbIsValid(con))
res <- dbGetQuery(con, "SELECT 42")
@@ -258,9 +258,12 @@ test_that("dis/re-connect", {
dbDisconnect(con)
expect_false(dbIsValid(con))
expect_error(dbSendQuery(con, "SELECT 1"))
- # this throws a warning because we cannot re-initialize embedded monetdb
- expect_warning(con <- dbConnect(MonetDB.R::MonetDB.R(),
embedded="/tmp"))
+ # we can restart in same dir
+ con <- dbConnect(MonetDB.R::MonetDB.R(), embedded=dbdir)
+ expect_true(dbIsValid(con))
res <- dbSendQuery(con, "SELECT 1")
expect_true(dbIsValid(res))
+ # but not in a different one
+ expect_error(con <- dbConnect(MonetDBLite(), "/tmp"))
})
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
