MonetDB: Oct2014 - Added monetdbd property support for --set emb...

[Hannes Muehleisen]

Changeset: 88171f6cfcf6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=88171f6cfcf6
Modified Files:
        tools/merovingian/daemon/forkmserver.c
        tools/merovingian/utils/properties.c
Branch: Oct2014
Log Message:

Added monetdbd property support for --set embedded_r=true flag


Unterschiede (43 Zeilen):

diff --git a/tools/merovingian/daemon/forkmserver.c 
b/tools/merovingian/daemon/forkmserver.c
--- a/tools/merovingian/daemon/forkmserver.c
+++ b/tools/merovingian/daemon/forkmserver.c
@@ -280,6 +280,7 @@ forkMserver(char *database, sabdb** stat
                char nclients[24];
                char pipeline[512];
                char *readonly = NULL;
+               char *embeddedr = NULL;
                char *argv[24]; /* for the exec arguments */
                int c = 0;
                unsigned int mport;
@@ -323,6 +324,10 @@ forkMserver(char *database, sabdb** stat
                if (kv->val != NULL && strcmp(kv->val, "no") != 0)
                        readonly = "--readonly";
 
+               kv = findConfKey(ckv, "embedr");
+               if (kv->val != NULL && strcmp(kv->val, "false") != 0)
+                       embeddedr = "embedded_r=true";
+
                freeConfFile(ckv);
                free(ckv); /* can make ckv static and reuse it all the time */
 
@@ -387,6 +392,9 @@ forkMserver(char *database, sabdb** stat
                if (pipeline[0] != '\0') {
                        argv[c++] = "--set"; argv[c++] = pipeline;
                }
+               if (embeddedr[0] != '\0') {
+                       argv[c++] = "--set"; argv[c++] = embeddedr;
+               }
                if (readonly != NULL) {
                        argv[c++] = readonly;
                }
diff --git a/tools/merovingian/utils/properties.c 
b/tools/merovingian/utils/properties.c
--- a/tools/merovingian/utils/properties.c
+++ b/tools/merovingian/utils/properties.c
@@ -40,6 +40,7 @@ static confkeyval _internal_prop_keys[] 
        {"nthreads", NULL, 0, INT},
        {"optpipe",  NULL, 0, STR},
        {"readonly", NULL, 0, BOOLEAN},
+       {"embedr",   NULL, 0, BOOLEAN},
        {"nclients", NULL, 0, INT},
        {"mfunnel",  NULL, 0, STR},
        { NULL,      NULL, 0, INVALID}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list