MonetDB: pythonudf - Add embedpy=true option back into monetdbd.

[Mark Raasveldt]

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

Add embedpy=true option back into monetdbd.


diffs (68 lines):

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
@@ -270,6 +270,7 @@ forkMserver(char *database, sabdb** stat
                char pipeline[512];
                char *readonly = NULL;
                char *embeddedr = NULL;
+               char *embeddedpy = NULL;
                char *argv[512];        /* for the exec arguments */
                char property_other[1024];
                int c = 0;
@@ -318,6 +319,11 @@ forkMserver(char *database, sabdb** stat
                if (kv->val != NULL && strcmp(kv->val, "no") != 0)
                        embeddedr = "embedded_r=true";
 
+               kv = findConfKey(ckv, "embedpy");
+               if (kv->val != NULL && strcmp(kv->val, "no") != 0)
+                       embeddedpy = "embedded_py=true";
+
+
                /* redirect stdout and stderr to a new pair of fds for
                 * logging help */
                close(pfdo[0]);
@@ -382,6 +388,9 @@ forkMserver(char *database, sabdb** stat
                if (embeddedr != NULL) {
                        argv[c++] = "--set"; argv[c++] = embeddedr;
                }
+               if (embeddedpy != NULL) {
+                       argv[c++] = "--set"; argv[c++] = embeddedpy;
+               }
                if (readonly != NULL) {
                        argv[c++] = readonly;
                }
diff --git a/tools/merovingian/daemon/merovingian.c 
b/tools/merovingian/daemon/merovingian.c
--- a/tools/merovingian/daemon/merovingian.c
+++ b/tools/merovingian/daemon/merovingian.c
@@ -467,6 +467,8 @@ main(int argc, char *argv[])
        kv->val = strdup("no");
        kv = findConfKey(_mero_db_props, "embedr");
        kv->val = strdup("no");
+       kv = findConfKey(_mero_db_props, "embedpy");
+       kv->val = strdup("no");
        kv = findConfKey(_mero_db_props, "nclients");
        kv->val = strdup("64");
        kv = findConfKey(_mero_db_props, "type");
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
@@ -30,6 +30,7 @@ static confkeyval _internal_prop_keys[50
        {"optpipe",  NULL, 0, STR},
        {"readonly", NULL, 0, BOOLEAN},
        {"embedr",   NULL, 0, BOOLEAN},
+       {"embedpy",   NULL, 0, BOOLEAN},
        {"nclients", NULL, 0, INT},
        {"mfunnel",  NULL, 0, STR},
        { NULL,      NULL, 0, INVALID}
diff --git a/tools/merovingian/utils/utils.c b/tools/merovingian/utils/utils.c
--- a/tools/merovingian/utils/utils.c
+++ b/tools/merovingian/utils/utils.c
@@ -133,6 +133,8 @@ defaultProperty(char *property) {
                return 1;
        } else if (property != NULL && strcmp(property, "embedr") == 0) {
                return 1;
+       } else if (property != NULL && strcmp(property, "embedpy") == 0) {
+               return 1;
        }
        return 0;
 }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list