MonetDB: cmake-monetdblite - Call BBPaddfarm before GDKinit.

[Pedro Ferreira]

Changeset: 1e066d7c4918 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1e066d7c4918
Modified Files:
        embedded/monetdb_embedded.c
Branch: cmake-monetdblite
Log Message:

Call BBPaddfarm before GDKinit.


diffs (29 lines):

diff --git a/embedded/monetdb_embedded.c b/embedded/monetdb_embedded.c
--- a/embedded/monetdb_embedded.c
+++ b/embedded/monetdb_embedded.c
@@ -396,6 +396,25 @@ monetdb_startup(char* dbdir, bool silent
                msg = createException(MAL, "embedded.monetdb_startup", 
MAL_MALLOC_FAIL);
                goto cleanup;
        }
+       if (!dbdir) {
+               if (BBPaddfarm(NULL, (1 << PERSISTENT) | (1 << TRANSIENT)) != 
GDK_SUCCEED) {
+                       mo_free_options(set, setlen);
+                       msg = createException(MAL, "embedded.monetdb_startup", 
"Cannot add in-memory farm");
+                       goto cleanup;
+               }
+       } else {
+               if (BBPaddfarm(dbdir, 1 << PERSISTENT) != GDK_SUCCEED ||
+                       BBPaddfarm(/*dbextra ? dbextra : */dbdir, 1 << 
TRANSIENT) != GDK_SUCCEED) {
+                       mo_free_options(set, setlen);
+                       msg = createException(MAL, "embedded.monetdb_startup", 
"Cannot add farm %s", dbdir);
+                       goto cleanup;
+               }
+               if (GDKcreatedir(dbdir) != GDK_SUCCEED) {
+                       mo_free_options(set, setlen);
+                       msg = createException(MAL, "embedded.monetdb_startup", 
"Cannot create directory %s", dbdir);
+                       goto cleanup;
+               }
+       }
        gdk_res = GDKinit(set, setlen);
        mo_free_options(set, setlen);
        if (gdk_res == GDK_FAIL) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list