Changeset: 41042346c287 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=41042346c287
Modified Files:
tools/embedded/build-rpkg.sh
tools/embedded/rpackage/R/monetdb.R
tools/embedded/rpackage/configure
tools/embedded/rpackage/configure.win
tools/embedded/rpackage/man/embedded.Rd
Branch: embedded
Log Message:
making cran check happier
diffs (169 lines):
diff --git a/tools/embedded/build-rpkg.sh b/tools/embedded/build-rpkg.sh
--- a/tools/embedded/build-rpkg.sh
+++ b/tools/embedded/build-rpkg.sh
@@ -21,28 +21,17 @@ echo "SUBDIRS = buildtools common client
sed -i -e "/^SUBDIRS = .*$/d" sql/backends/monet5/Makefile.ag
./bootstrap
-# we need this directory since sql/server depends on it
+# buildtools/conf/lt~obsolete.m4 file name violates CRAN policies, rename and
replace references
+mv "buildtools/conf/lt~obsolete.m4" buildtools/conf/lt-obsolete.m4
+find . -name "Makefile.in" -exec sed -i -e
"s/lt~obsolete\.m4/lt-obsolete\.m4/g" {} \;
+
cd ..
mv sourcetree/tools/embedded/rpackage .
rsync -av --exclude-from sourcetree/tools/embedded/pkg-excludes sourcetree/
rpackage/src
# generate mal/sql scripts and sql_parser.tab.c/h to remove our dependency on
bison.
-#ln -s sourcetree src
export R_INCLUDE_DIR=`R CMD config --cppflags | sed s/^-I//`
-#export R_PACKAGE_DIR=$STAGEDIR/dummytarget
-#mkdir $R_PACKAGE_DIR
-# install a build in the dummytarget dir to collect mal/sql scripts
-# need these two files so the dummy build goes through, they are generated
later
-#echo "char* mal_init_inline = NULL;" >
sourcetree/monetdb5/mal/mal_init_inline.h
-#echo "char* createdb_inline = NULL;" >
sourcetree/sql/backends/monet5/createdb_inline.h
-# run dummy build
-#./rpackage/configure
-# steal the sql parser files
-# cd sourcetree
-# ./configure
-# make sql/server/sql_parser.tab.c sql/server/sql_parser.tab.h
-# cd ..
-# cp sourcetree/sql/server/sql_parser.tab.* rpackage/src/sql/server/
+
# # inline mal/sql scripts, we need R with the stringr package for that
# python sourcetree/tools/embedded/inline.py dummytarget/libs/monetdb5/
rpackage/src/monetdb5/mal/mal_init_inline.h
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
@@ -5,7 +5,7 @@ monetdb_embedded_env$is_started <- FALSE
monetdb_embedded_env$started_dir <- ""
.onLoad <- function(libname, pkgname){
- library.dynam("libmonetdb5", pkgname, lib.loc=libname, now=T, local=F)
+ library.dynam("MonetDBLite", pkgname, lib.loc=libname, now=T, local=F)
}
classname <- "monetdb_embedded_connection"
@@ -24,7 +24,7 @@ monetdb_embedded_startup <- function(dir
}
dir <- normalizePath(dir)
if (!monetdb_embedded_env$is_started) {
- res <- .Call("monetdb_startup_R", dir, quiet,
PACKAGE="libmonetdb5")
+ res <- .Call("monetdb_startup_R", dir, quiet,
PACKAGE="MonetDBLite")
} else {
if (dir != monetdb_embedded_env$started_dir) {
stop("MonetDBLite cannot change database directories
(already started in ", monetdb_embedded_env$started_dir, ", restart R).")
@@ -54,7 +54,7 @@ monetdb_embedded_query <- function(conn,
}
# make sure the query is terminated
query <- paste(query, "\n;", sep="")
- res <- .Call("monetdb_query_R", conn, query, notreally,
PACKAGE="libmonetdb5")
+ res <- .Call("monetdb_query_R", conn, query, notreally,
PACKAGE="MonetDBLite")
resp <- list()
if (is.character(res)) { # error
@@ -90,7 +90,7 @@ monetdb_embedded_append <- function(conn
if (!inherits(conn, classname)) {
stop("Need a embedded monetdb connection as parameter")
}
- .Call("monetdb_append_R", conn, schema, table, tdata,
PACKAGE="libmonetdb5")
+ .Call("monetdb_append_R", conn, schema, table, tdata,
PACKAGE="MonetDBLite")
}
@@ -98,7 +98,7 @@ monetdb_embedded_connect <- function() {
if (!monetdb_embedded_env$is_started) {
stop("Call monetdb_embedded_startup() first")
}
- res <- .Call("monetdb_connect_R", PACKAGE="libmonetdb5")
+ res <- .Call("monetdb_connect_R", PACKAGE="MonetDBLite")
class(res) <- classname
return(res)
}
@@ -107,12 +107,12 @@ monetdb_embedded_disconnect <- function(
if (!inherits(conn, classname)) {
stop("Need a embedded monetdb connection as parameter")
}
- .Call("monetdb_disconnect_R", conn, PACKAGE="libmonetdb5")
+ .Call("monetdb_disconnect_R", conn, PACKAGE="MonetDBLite")
return(invisible(TRUE))
}
monetdb_embedded_shutdown <- function() {
- .Call("monetdb_shutdown_R", PACKAGE="libmonetdb5")
+ .Call("monetdb_shutdown_R", PACKAGE="MonetDBLite")
monetdb_embedded_env$is_started <- FALSE
monetdb_embedded_env$started_dir <- ""
return(invisible(TRUE))
diff --git a/tools/embedded/rpackage/configure
b/tools/embedded/rpackage/configure
--- a/tools/embedded/rpackage/configure
+++ b/tools/embedded/rpackage/configure
@@ -15,7 +15,7 @@ make -k -j
echo -e "dummytarget:\n\ttrue\n" > Makefile
# and finally put the embedded library where R expects it
-RDYNLIB=$R_PACKAGE_DIR/libs/libmonetdb5.so
+RDYNLIB=$R_PACKAGE_DIR/libs/MonetDBLite.so
mkdir -p $R_PACKAGE_DIR/libs
OFILES=`find common clients/mapilib/ gdk monetdb5/mal monetdb5/modules
monetdb5/optimizer sql tools/embedded -name "*.o" | tr "\n" " "`
diff --git a/tools/embedded/rpackage/configure.win
b/tools/embedded/rpackage/configure.win
--- a/tools/embedded/rpackage/configure.win
+++ b/tools/embedded/rpackage/configure.win
@@ -14,8 +14,8 @@ cd src
make
OFILES=`find common clients/mapilib/ gdk monetdb5/mal monetdb5/modules
monetdb5/optimizer sql tools/embedded -name "*.lo" | tr "\n" " "`
-rm libmonetdb5.dll
-gcc -shared -m64 -o libmonetdb5.dll $OFILES -lws2_32 -lpthread -lpsapi
-Ltools/embedded/windows/pcre-8.37/libs/x64/ -lpcre `R CMD config --ldflags`
+rm MonetDBLite.dll
+gcc -shared -m64 -o MonetDBLite.dll $OFILES -lws2_32 -lpthread -lpsapi
-Ltools/embedded/windows/pcre-8.37/libs/x64/ -lpcre `R CMD config --ldflags`
cd ../
mkdir -p $R_PACKAGE_DIR/libs/x64
diff --git a/tools/embedded/rpackage/man/embedded.Rd
b/tools/embedded/rpackage/man/embedded.Rd
--- a/tools/embedded/rpackage/man/embedded.Rd
+++ b/tools/embedded/rpackage/man/embedded.Rd
@@ -2,19 +2,23 @@
\alias{monetdb_embedded_startup}
\alias{monetdb_embedded_query}
\alias{monetdb_embedded_append}
+\alias{monetdb_embedded_connect}
+\alias{monetdb_embedded_disconnect}
+\alias{monetdb_embedded_shutdown}
\title{
Control embedded MonetDB
}
\description{
-TODO
+This is a low-level API for MonetDBLite. A \code{DBI}/\code{dplyr} frontend
for these functions is in the \code{MonetDB.R} package.
}
\usage{
monetdb_embedded_startup(dir=tempdir(), quiet=TRUE)
+monetdb_embedded_connect()
monetdb_embedded_query(conn, query, notreally=FALSE)
monetdb_embedded_append(conn, table, tdata, schema="sys")
-monetdb_embedded_connect()
monetdb_embedded_disconnect(conn)
+monetdb_embedded_shutdown()
}
\arguments{
\item{dir}{Path to the directory where the database will be created. Must be
writeable or createable.}
@@ -34,7 +38,10 @@ monetdb_embedded_disconnect(conn)
\examples{
monetdb_embedded_startup(tempdir())
-monetdb_embedded_query("SELECT * FROM tables;")
-monetdb_embedded_query("CREATE TABLE foo(i INTEGER, j INTEGER)")
-monetdb_embedded_append("foo", data.frame(i=1:10, j=21:30))
+conn <- monetdb_embedded_connect()
+monetdb_embedded_query(conn, "SELECT * FROM tables;")
+monetdb_embedded_query(conn, "CREATE TABLE foo(i INTEGER, j INTEGER)")
+monetdb_embedded_append(conn, "foo", data.frame(i=1:10, j=21:30))
+monetdb_embedded_disconnect(conn)
+monetdb_embedded_shutdown()
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
