Changeset: a9eba922c383 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a9eba922c383
Modified Files:
clients/R/MonetDB.R/DESCRIPTION
clients/R/MonetDB.R/R/control.R
clients/R/Tests/dbi.R
Branch: Oct2014
Log Message:
R Connector: minor changes
Unterschiede (42 Zeilen):
diff --git a/clients/R/MonetDB.R/DESCRIPTION b/clients/R/MonetDB.R/DESCRIPTION
--- a/clients/R/MonetDB.R/DESCRIPTION
+++ b/clients/R/MonetDB.R/DESCRIPTION
@@ -1,5 +1,5 @@
Package: MonetDB.R
-Version: 0.9.5
+Version: 0.9.6
Title: Connect MonetDB to R
Authors@R: c(person("Hannes Muehleisen", role = c("aut", "cre"),email =
"[email protected]"),
person("Thomas Lumley", role = "ctb"),
diff --git a/clients/R/MonetDB.R/R/control.R b/clients/R/MonetDB.R/R/control.R
--- a/clients/R/MonetDB.R/R/control.R
+++ b/clients/R/MonetDB.R/R/control.R
@@ -10,7 +10,7 @@ monetdb.server.start <-
# run script
system(bat.file,wait=T)
-
+
# read pid from file
pid <- scan(pidfile,what=integer(),n=1)
return(pid)
@@ -75,7 +75,7 @@ monetdb.server.stop <-
system(paste0("kill ",correct.pid))
waittime <- 2
if (!wait) return(TRUE)
- Sys.sleep(1)
+ Sys.sleep(.5)
repeat {
psout <- system(paste0("ps ax | grep \"^", correct.pid,
".*mserver5\""), ignore.stdout=T)
if (psout != 0) break
diff --git a/clients/R/Tests/dbi.R b/clients/R/Tests/dbi.R
--- a/clients/R/Tests/dbi.R
+++ b/clients/R/Tests/dbi.R
@@ -11,6 +11,7 @@ if (length(args) > 0)
dbport <- args[[1]]
options(monetdb.insert.splitsize=10)
+
tname <- "monetdbtest"
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
