MonetDB: embedded - linux and old R version compatibility

[Hannes Muehleisen]

Changeset: 0dda14fe5f85 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0dda14fe5f85
Modified Files:
        tools/embedded/embedded.c
        tools/reverserapi/R/monetdb.R
Branch: embedded
Log Message:

linux and old R version compatibility


diffs (42 lines):

diff --git a/tools/embedded/embedded.c b/tools/embedded/embedded.c
--- a/tools/embedded/embedded.c
+++ b/tools/embedded/embedded.c
@@ -72,7 +72,7 @@ int monetdb_startup(char* dir, char sile
 
        monetdb_embedded_initialized = true;
        // sanity check, run a SQL query
-       if (monetdb_query("SELECT * FROM tables;", res) < 0) {
+       if (monetdb_query("SELECT * FROM tables;", res) != NULL) {
                monetdb_embedded_initialized = false;
                goto cleanup;
        }
@@ -196,11 +196,14 @@ SEXP monetdb_query_R(SEXP query) {
 }
 
 SEXP monetdb_startup_R(SEXP dirsexp, SEXP silentsexp) {
+       const char* dir = NULL;
+       char silent = 0;
+       int res = 0;
        if (!IS_CHARACTER(dirsexp) || !IS_LOGICAL(silentsexp)) {
                return ScalarInteger(-1);
        }
-       const char* dir = CHAR(STRING_ELT(dirsexp, 0));
-       char silent = LOGICAL(silentsexp)[0];
-       int res = monetdb_startup((char*) dir, silent);
+       dir = CHAR(STRING_ELT(dirsexp, 0));
+       silent = LOGICAL(silentsexp)[0];
+       res = monetdb_startup((char*) dir, silent);
        return ScalarInteger(res);
 }
diff --git a/tools/reverserapi/R/monetdb.R b/tools/reverserapi/R/monetdb.R
--- a/tools/reverserapi/R/monetdb.R
+++ b/tools/reverserapi/R/monetdb.R
@@ -8,7 +8,7 @@ monetdb_embedded_startup <- function(dir
        if (length(dir) != 1) {
                stop("Need a single directory name as parameter.")
        }
-       if (!dir.exists(dir) && !dir.create(dir, recursive=T)) {
+       if (!file.exists(dir) && !dir.create(dir, recursive=T)) {
                stop("Cannot create ", dir)
        }
        if (file.access(dir, mode=2) < 0) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list